Update diffoscope to 264 and reprotest to 0.7.27

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Vagrant Cascadian
Owner
unassigned
Submitted by
Vagrant Cascadian
Severity
normal
V
V
Vagrant Cascadian wrote on 16 Apr 22:56 +0200
(address . guix-patches@gnu.org)
8734rl2fhz.fsf@wireframe
The attached patches update diffoscope to 264 and fixes an issue with
the architecture-specific conditional native-input on enjarify, and
updates reprotest to 0.7.27.

live well,
vagrant
From 0470b32bbfb3bd2702083ac75e06842ca2d9bd42 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 13 Apr 2024 17:28:40 -0700
Subject: [PATCH 1/2] gnu: diffoscope: Update to 264.

* gnu/packages/diffoscope.scm (diffoscope): Update to 264.
[native-inputs]: Fix architecture specific conditional for "enjarify"
---
gnu/packages/diffoscope.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8106a6d258..fbcf3a36f2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "263")
+ (version "264")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
+ (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57"))))
(build-system python-build-system)
(arguments
(list
@@ -233,9 +233,9 @@ (define (bin command)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
- (list enjarify)
;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
+ (list `(,openjdk12 "jdk")
+ enjarify))
(_ '()))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")

base-commit: 921b270a444f695259621365ce93910104eb5410
--
2.39.2
From cc540440521ca919814e7d8b35368d2ecc12daaf Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 16 Apr 2024 13:53:08 -0700
Subject: [PATCH 2/2] gnu: reprotest: Update to 0.7.27.

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.27.
---
gnu/packages/diffoscope.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fbcf3a36f2..8b72072bb5 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -253,7 +253,7 @@ (define (bin command)
(define-public reprotest
(package
(name "reprotest")
- (version "0.7.26")
+ (version "0.7.27")
(source
(origin
(method git-fetch)
@@ -262,7 +262,7 @@ (define-public reprotest
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd"))))
+ (base32 "0z5i53dy4ax4gbidcqmwqq0686n1g397c79bsscfs94s2y35fsns"))))
(inputs
(list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs
--
2.39.2
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZh7mCAAKCRDcUY/If5cW
qlmyAQCA745Dz0gYaG65Zc93xcUvXJuq9beuB1QJfZP3lzlV3QD/cyfWz+TJ7DG+
ceovjAkG/JnCynBXbH5IypXs64WWrAc=
=fQid
-----END PGP SIGNATURE-----

V
V
Vagrant Cascadian wrote on 18 Apr 18:21 +0200
(address . guix-patches@gnu.org)
87cyqm1w1h.fsf@wireframe
Try again, with patches in separate emails...
From 0470b32bbfb3bd2702083ac75e06842ca2d9bd42 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 13 Apr 2024 17:28:40 -0700
Subject: [PATCH 1/2] gnu: diffoscope: Update to 264.

* gnu/packages/diffoscope.scm (diffoscope): Update to 264.
[native-inputs]: Fix architecture specific conditional for "enjarify"
---
gnu/packages/diffoscope.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8106a6d258..fbcf3a36f2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "263")
+ (version "264")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
+ (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57"))))
(build-system python-build-system)
(arguments
(list
@@ -233,9 +233,9 @@ (define (bin command)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
- (list enjarify)
;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
+ (list `(,openjdk12 "jdk")
+ enjarify))
(_ '()))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")

base-commit: 921b270a444f695259621365ce93910104eb5410
--
2.39.2
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZiFIigAKCRDcUY/If5cW
qnbfAQCfXKwZG3Ezg+hFWleB4BJAYGz/A0eHWeKzk5YcBrUTnAD+IjssG0pIcMUf
0nkmQEilNqFWDKmKnfP4UwFKQrk6qQQ=
=KVt3
-----END PGP SIGNATURE-----

V
V
Vagrant Cascadian wrote on 18 Apr 18:22 +0200
(address . guix-patches@gnu.org)
87a5lq1vzg.fsf@wireframe
On 2024-04-18, Vagrant Cascadian wrote:
Toggle quote (1 lines)
> Try again, with patches in separate emails...
2 of 2 ...
From cc540440521ca919814e7d8b35368d2ecc12daaf Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Tue, 16 Apr 2024 13:53:08 -0700
Subject: [PATCH 2/2] gnu: reprotest: Update to 0.7.27.

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.27.
---
gnu/packages/diffoscope.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fbcf3a36f2..8b72072bb5 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -253,7 +253,7 @@ (define (bin command)
(define-public reprotest
(package
(name "reprotest")
- (version "0.7.26")
+ (version "0.7.27")
(source
(origin
(method git-fetch)
@@ -262,7 +262,7 @@ (define-public reprotest
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd"))))
+ (base32 "0z5i53dy4ax4gbidcqmwqq0686n1g397c79bsscfs94s2y35fsns"))))
(inputs
(list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs
--
2.39.2
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZiFI0wAKCRDcUY/If5cW
qlL8AQDLr/PVJWGGUvQdcK34/dB4RIlk0vkTbxt8Pg16qZsf+wD/fxqwE6sdBOB9
faZprsnfd/8d7Kk2svqS1WHRId+MTQM=
=nDQw
-----END PGP SIGNATURE-----

V
V
vagrant wrote on 18 Apr 21:42 +0200
[PATCH 2/2] gnu: reprotest: Update to 0.7.27.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240418194233.192105-2-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.27.
---
gnu/packages/diffoscope.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fbcf3a36f2..8b72072bb5 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -253,7 +253,7 @@ (define (bin command)
(define-public reprotest
(package
(name "reprotest")
- (version "0.7.26")
+ (version "0.7.27")
(source
(origin
(method git-fetch)
@@ -262,7 +262,7 @@ (define-public reprotest
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd"))))
+ (base32 "0z5i53dy4ax4gbidcqmwqq0686n1g397c79bsscfs94s2y35fsns"))))
(inputs
(list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs
--
2.39.2
V
V
vagrant wrote on 18 Apr 21:42 +0200
[PATCH 1/2] gnu: diffoscope: Update to 264.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240418194233.192105-1-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (diffoscope): Update to 264.
[native-inputs]: Fix architecture specific conditional for "enjarify"
---
gnu/packages/diffoscope.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8106a6d258..fbcf3a36f2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "263")
+ (version "264")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
+ (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57"))))
(build-system python-build-system)
(arguments
(list
@@ -233,9 +233,9 @@ (define (bin command)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
- (list enjarify)
;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
+ (list `(,openjdk12 "jdk")
+ enjarify))
(_ '()))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")

base-commit: 65e8472a4b6fc6f66871ba0dad518b7d4c63595e
--
2.39.2
V
V
vagrant wrote on 19 Apr 20:25 +0200
[PATCH 1/3] gnu: diffoscope: Update to 264.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240419182553.352485-1-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (diffoscope): Update to 264.
[native-inputs]: Fix architecture specific conditional for "enjarify"
---
gnu/packages/diffoscope.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8106a6d258..fbcf3a36f2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "263")
+ (version "264")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
+ (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57"))))
(build-system python-build-system)
(arguments
(list
@@ -233,9 +233,9 @@ (define (bin command)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
- (list enjarify)
;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
+ (list `(,openjdk12 "jdk")
+ enjarify))
(_ '()))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")

base-commit: e4b758e70561af9a673ac46d8d754ae4e7240341
--
2.39.2
V
V
vagrant wrote on 19 Apr 20:25 +0200
[PATCH 2/3] gnu: reprotest: Update to 0.7.27.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240419182553.352485-2-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.27.
---
gnu/packages/diffoscope.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fbcf3a36f2..8b72072bb5 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -253,7 +253,7 @@ (define (bin command)
(define-public reprotest
(package
(name "reprotest")
- (version "0.7.26")
+ (version "0.7.27")
(source
(origin
(method git-fetch)
@@ -262,7 +262,7 @@ (define-public reprotest
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd"))))
+ (base32 "0z5i53dy4ax4gbidcqmwqq0686n1g397c79bsscfs94s2y35fsns"))))
(inputs
(list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs
--
2.39.2
V
V
vagrant wrote on 19 Apr 20:25 +0200
[PATCH 3/3] gnu: diffoscope: Update to 265.
(address . 70428@debbugs.gnu.org)
20240419182553.352485-3-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@debian.org>

* gnu/packages/diffoscope.scm (diffoscope): Update to 265.
[source]: Use commit instead of tag, as tag does not exist yet.
---
gnu/packages/diffoscope.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8b72072bb5..d1dc45065c 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,16 +75,17 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "264")
+ (version "265")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
- (commit version)))
+ ;; No tag yet...
+ (commit "0be25cce2974851d697578ed208a0ff2c1556ff3")))
(file-name (git-file-name name version))
(sha256
- (base32 "1m2jrg0y283m07gml7nd6fy4x827i93bj23varjn3add4kixxr57"))))
+ (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
(build-system python-build-system)
(arguments
(list
--
2.39.2
V
V
Vagrant Cascadian wrote on 19 Apr 20:43 +0200
(address . 70428@debbugs.gnu.org)
87plulyz06.fsf@wireframe
On 2024-04-19, vagrant@reproducible-builds.org wrote:
Toggle quote (2 lines)
> From: Vagrant Cascadian <vagrant@debian.org>

Oops. That should have been vagrant@reproducible-builds.org ...

Toggle quote (2 lines)
> * gnu/packages/diffoscope.scm (diffoscope): Update to 265.
> [source]: Use commit instead of tag, as tag does not exist yet.
...
Toggle quote (7 lines)
> (uri (git-reference
> (url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
> - (commit version)))
> + ;; No tag yet...
> + (commit "0be25cce2974851d697578ed208a0ff2c1556ff3")))
> (file-name (git-file-name name version))

Hopefully a tag will be made available soon, but until then, I figured
it would be nice to get it building on the build farm to test, at least.

This can obviously be squashed into the commit with version 264 when
actually pushing.

live well,
vagrant
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZiK7SgAKCRDcUY/If5cW
qmBPAQCNR2R+5cRLBfce1X5NJS29hxbmGO02/2wN4/w4puy3QQD/fPYeroKU/5HE
5lJHCSBKoI8sIjkfoOXMrAS/7zZ25Qk=
=U2WI
-----END PGP SIGNATURE-----

V
V
vagrant wrote on 19 Apr 21:31 +0200
[PATCH 1/2] gnu: reprotest: Update to 0.7.27.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240419193117.425782-1-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.27.
---
gnu/packages/diffoscope.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8106a6d258..d97ce5dda2 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -253,7 +253,7 @@ (define (bin command)
(define-public reprotest
(package
(name "reprotest")
- (version "0.7.26")
+ (version "0.7.27")
(source
(origin
(method git-fetch)
@@ -262,7 +262,7 @@ (define-public reprotest
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd"))))
+ (base32 "0z5i53dy4ax4gbidcqmwqq0686n1g397c79bsscfs94s2y35fsns"))))
(inputs
(list python-debian python-distro python-libarchive-c python-rstr))
(native-inputs

base-commit: e4b758e70561af9a673ac46d8d754ae4e7240341
--
2.39.2
V
V
vagrant wrote on 19 Apr 21:31 +0200
[PATCH 2/2] gnu: diffoscope: Update to 265.
(address . 70428@debbugs.gnu.org)(address . vagrant@reproducible-builds.org)
20240419193117.425782-2-vagrant@reproducible-builds.org
From: Vagrant Cascadian <vagrant@reproducible-builds.org>

* gnu/packages/diffoscope.scm (diffoscope): Update to 265.
[native-inputs]: Fix architecture specific conditional for "enjarify"
---
gnu/packages/diffoscope.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index d97ce5dda2..fd2146456d 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
(define-public diffoscope
(package
(name "diffoscope")
- (version "263")
+ (version "265")
(source
(origin
(method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
+ (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
(build-system python-build-system)
(arguments
(list
@@ -233,9 +233,9 @@ (define (bin command)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
- (list enjarify)
;; No unversioned openjdk available.
- (list `(,openjdk12 "jdk")))
+ (list `(,openjdk12 "jdk")
+ enjarify))
(_ '()))))
(home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")
--
2.39.2
V
V
Vagrant Cascadian wrote on 19 Apr 21:44 +0200
(address . 70428@debbugs.gnu.org)
87msppyw6t.fsf@wireframe
On 2024-04-19, vagrant@reproducible-builds.org wrote:
Toggle quote (5 lines)
> From: Vagrant Cascadian <vagrant@reproducible-builds.org>
>
> * gnu/packages/diffoscope.scm (diffoscope): Update to 265.
> [native-inputs]: Fix architecture specific conditional for "enjarify"

The tag for 265 landed. Yay!

I think I'm done pushing trivial fixes now!

live well,
vagrant


Toggle quote (40 lines)
> ---
> gnu/packages/diffoscope.scm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
> index d97ce5dda2..fd2146456d 100644
> --- a/gnu/packages/diffoscope.scm
> +++ b/gnu/packages/diffoscope.scm
> @@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
> (define-public diffoscope
> (package
> (name "diffoscope")
> - (version "263")
> + (version "265")
> (source
> (origin
> (method git-fetch)
> @@ -84,7 +84,7 @@ (define-public diffoscope
> (commit version)))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "1bq45gyn214hf9brnn5xlj9xvcg6p0yr8cc2p153f93pgzsyqlg4"))))
> + (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
> (build-system python-build-system)
> (arguments
> (list
> @@ -233,9 +233,9 @@ (define (bin command)
> ;; openjdk and dependent packages are only
> ;; available on x86_64 currently.
> ((or "x86_64-linux")
> - (list enjarify)
> ;; No unversioned openjdk available.
> - (list `(,openjdk12 "jdk")))
> + (list `(,openjdk12 "jdk")
> + enjarify))
> (_ '()))))
> (home-page "https://diffoscope.org/")
> (synopsis "Compare files, archives, and directories in depth")
> --
> 2.39.2
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZiLJigAKCRDcUY/If5cW
qu1eAQDX7wgwoYa0io3GsxKF6rdH/fKzCsjMOtRbSHRU7qw/6QD+LLps9nbaG5Wm
RlzRkK2XL3UEtDbuzIPqucCODL2zEAk=
=QJbo
-----END PGP SIGNATURE-----

C
C
Christopher Baines wrote on 23 Apr 15:59 +0200
Re: [bug#70428] [PATCH 1/3] gnu: diffoscope: Update to 264.
(address . vagrant@reproducible-builds.org)(address . 70428-done@debbugs.gnu.org)
87edawyyc4.fsf@cbaines.net
vagrant@reproducible-builds.org writes:

Toggle quote (8 lines)
> From: Vagrant Cascadian <vagrant@reproducible-builds.org>
>
> * gnu/packages/diffoscope.scm (diffoscope): Update to 264.
> [native-inputs]: Fix architecture specific conditional for "enjarify"
> ---
> gnu/packages/diffoscope.scm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

Thanks, I've removed the commit/tag bit when updating to 265 as the tag
seems to now exist, and I've pushed these patches to master as
10d0e2d3110e4be2bc6cfecb9a3abb83d8e1ddd6.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYnvqtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xc3Sw//fPeppA8FCmlkRn8NQF6ujNP6d6jo0F9i
iniQ/qKxTodfjfDgbNAIM/mgDlDNyHhQ8MjLum4YedKu1M49ttu805JZEjNS7pmi
SN83mfAkbkjSXZhPfsBMxW/MV6X5vHTQe0/6Qu96dyTEM0YE9p7htlm6r7Zp9iz0
zsy1iNuF+792oWCPFgAET/kUkGks2CdE3P7JxpjtgcYf2WwK9/pVjpP0ol5QkfFf
11GVw4rerpN4/Nay6Bil7OquviVCKGBnX15pJhCoFyLhCR0gN3HEvOPozIBL7hRx
o/je2Xe9UFiKyxuv+nBCac2g2cGES8u6ITiYp19YxPg2NIU3L4BeARkgBGYtQ4i4
qlkOrEE8b8BcTX3rHuCmNgvk4s5HmHx5uJhpf1Mr5aJY/d3M+JgGygtZ8Z/hzSQf
zGUcGZF+lC6n3QB63KoWIAdo9Y6WEfiAb8VyYynlhVhBF7b/tW3KB7DFyBy4KSQh
FlbFvg+F3uA5ORjnkLtsyfhg2bAmtGu+xKZ+M7te2/4vyzVwyaR7E1tVbFaqKMca
K0SGDf3urO86trp58Xo2euboD2CfS9j+1pAi3CXRhjfgBhx33303YnW/H6yIzUKh
eVKse/m4QUWBgCn05VBJ1TiNswwOX6APoWnFoTwvHwfJkMdvitFxod+ECPC2E517
WrzzHB340y0=
=D+pi
-----END PGP SIGNATURE-----

Closed
V
V
Vagrant Cascadian wrote on 23 Apr 21:22 +0200
(name . Christopher Baines)(address . mail@cbaines.net)(address . 70428@debbugs.gnu.org)
877cgnzxxx.fsf@wireframe
On 2024-04-23, Christopher Baines wrote:
Toggle quote (14 lines)
> vagrant@reproducible-builds.org writes:
>
>> From: Vagrant Cascadian <vagrant@reproducible-builds.org>
>>
>> * gnu/packages/diffoscope.scm (diffoscope): Update to 264.
>> [native-inputs]: Fix architecture specific conditional for "enjarify"
>> ---
>> gnu/packages/diffoscope.scm | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Thanks, I've removed the commit/tag bit when updating to 265 as the tag
> seems to now exist, and I've pushed these patches to master as
> 10d0e2d3110e4be2bc6cfecb9a3abb83d8e1ddd6.

Curiously, looks like my last patchset which dropped 264 and switched
back to the tag for 265 was never imported into guix-patches.git, though
it seems to be patchwork:



Though having the complete history with both revisions versions is fine
by me too. Thanks! :)


live well,
vagrant
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZigKagAKCRDcUY/If5cW
quTeAP9J9ICyPxotYFQFAa37fjdBevWtJLHfQbAjl5FMs9W35wD/ZnazYuHTO4WK
gLhgv/YGdkKRbwiJc9Ey6TjKxjqqwgA=
=y1ry
-----END PGP SIGNATURE-----

?
Your comment

This issue is archived.

To comment on this conversation send an email to 70428@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70428
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch