GNU bug report logs - #70428
Update diffoscope to 264 and reprotest to 0.7.27

Previous Next

Package: guix-patches;

Reported by: Vagrant Cascadian <vagrant <at> reproducible-builds.org>

Date: Tue, 16 Apr 2024 20:58:02 UTC

Severity: normal

Done: Christopher Baines <mail <at> cbaines.net>

To reply to this bug, email your comments to 70428 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Tue, 16 Apr 2024 20:58:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Vagrant Cascadian <vagrant <at> reproducible-builds.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 16 Apr 2024 20:58:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: guix-patches <at> gnu.org
Subject: Update diffoscope to 264 and reprotest to 0.7.27
Date: Tue, 16 Apr 2024 13:56:40 -0700

[Message part 1 (text/plain, inline)]
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

[0001-gnu-diffoscope-Update-to-264.patch (text/x-diff, inline)]
From 0470b32bbfb3bd2702083ac75e06842ca2d9bd42 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> 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(-)

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


[0002-gnu-reprotest-Update-to-0.7.27.patch (text/x-diff, inline)]
From cc540440521ca919814e7d8b35368d2ecc12daaf Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> 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(-)

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


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Thu, 18 Apr 2024 16:23:03 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: guix-patches <at> gnu.org
Subject: Re: Update diffoscope to 264 and reprotest to 0.7.27
Date: Thu, 18 Apr 2024 09:21:30 -0700

[Message part 1 (text/plain, inline)]
Try again, with patches in separate emails...

[0001-gnu-diffoscope-Update-to-264.patch (text/x-diff, inline)]
From 0470b32bbfb3bd2702083ac75e06842ca2d9bd42 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> 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(-)

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


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Thu, 18 Apr 2024 16:24:03 GMT) Full text and rfc822 format available.

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: guix-patches <at> gnu.org
Subject: Re: Update diffoscope to 264 and reprotest to 0.7.27
Date: Thu, 18 Apr 2024 09:22:43 -0700

[Message part 1 (text/plain, inline)]
On 2024-04-18, Vagrant Cascadian wrote:
> Try again, with patches in separate emails...
2 of 2 ...

[0002-gnu-reprotest-Update-to-0.7.27.patch (text/x-diff, inline)]
From cc540440521ca919814e7d8b35368d2ecc12daaf Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> 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(-)

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


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Thu, 18 Apr 2024 19:44:01 GMT) Full text and rfc822 format available.

Message #14 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 2/2] gnu: reprotest: Update to 0.7.27.
Date: Thu, 18 Apr 2024 12:42:33 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Thu, 18 Apr 2024 19:44:03 GMT) Full text and rfc822 format available.

Message #17 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 1/2] gnu: diffoscope: Update to 264.
Date: Thu, 18 Apr 2024 12:42:32 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 18:27:03 GMT) Full text and rfc822 format available.

Message #20 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 1/3] gnu: diffoscope: Update to 264.
Date: Fri, 19 Apr 2024 11:25:51 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 18:27:04 GMT) Full text and rfc822 format available.

Message #23 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 2/3] gnu: reprotest: Update to 0.7.27.
Date: Fri, 19 Apr 2024 11:25:52 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 18:27:04 GMT) Full text and rfc822 format available.

Message #26 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: Vagrant Cascadian <vagrant <at> debian.org>, vagrant <at> reproducible-builds.org
Subject: [PATCH 3/3] gnu: diffoscope: Update to 265.
Date: Fri, 19 Apr 2024 11:25:53 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 18:44:02 GMT) Full text and rfc822 format available.

Message #29 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: 70428 <at> debbugs.gnu.org
Subject: Re: [PATCH 3/3] gnu: diffoscope: Update to 265.
Date: Fri, 19 Apr 2024 11:43:21 -0700

[Message part 1 (text/plain, inline)]
On 2024-04-19, vagrant <at> reproducible-builds.org wrote:
> From: Vagrant Cascadian <vagrant <at> debian.org>

Oops. That should have been vagrant <at> reproducible-builds.org ...

> * gnu/packages/diffoscope.scm (diffoscope): Update to 265.
> [source]: Use commit instead of tag, as tag does not exist yet.
...
>         (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

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 19:32:03 GMT) Full text and rfc822 format available.

Message #32 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 1/2] gnu: reprotest: Update to 0.7.27.
Date: Fri, 19 Apr 2024 12:31:16 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 19:33:02 GMT) Full text and rfc822 format available.

Message #35 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: vagrant <at> reproducible-builds.org
To: 70428 <at> debbugs.gnu.org
Cc: vagrant <at> reproducible-builds.org
Subject: [PATCH 2/2] gnu: diffoscope: Update to 265.
Date: Fri, 19 Apr 2024 12:31:17 -0700

From: Vagrant Cascadian <vagrant <at> 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(-)

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
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Fri, 19 Apr 2024 19:45:04 GMT) Full text and rfc822 format available.

Message #38 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: 70428 <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] gnu: diffoscope: Update to 265.
Date: Fri, 19 Apr 2024 12:44:10 -0700

[Message part 1 (text/plain, inline)]
On 2024-04-19, vagrant <at> reproducible-builds.org wrote:
> From: Vagrant Cascadian <vagrant <at> 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


> ---
>  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

[signature.asc (application/pgp-signature, inline)]
Reply sent to Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility. (Tue, 23 Apr 2024 14:00:08 GMT) Full text and rfc822 format available.
Notification sent to Vagrant Cascadian <vagrant <at> reproducible-builds.org>:
bug acknowledged by developer. (Tue, 23 Apr 2024 14:00:10 GMT) Full text and rfc822 format available.

Message #43 received at 70428-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: vagrant <at> reproducible-builds.org
Cc: 70428-done <at> debbugs.gnu.org
Subject: Re: [bug#70428] [PATCH 1/3] gnu: diffoscope: Update to 264.
Date: Tue, 23 Apr 2024 14:59:07 +0100

[Message part 1 (text/plain, inline)]
vagrant <at> reproducible-builds.org writes:

> From: Vagrant Cascadian <vagrant <at> 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

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#70428; Package guix-patches. (Tue, 23 Apr 2024 19:24:08 GMT) Full text and rfc822 format available.

Message #46 received at 70428 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 70428 <at> debbugs.gnu.org
Subject: Re: [bug#70428] [PATCH 1/3] gnu: diffoscope: Update to 264.
Date: Tue, 23 Apr 2024 12:22:18 -0700

[Message part 1 (text/plain, inline)]
On 2024-04-23, Christopher Baines wrote:
> vagrant <at> reproducible-builds.org writes:
>
>> From: Vagrant Cascadian <vagrant <at> 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:

  https://patches.guix-patches.cbaines.net/project/guix-patches/list/?series=22495


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


live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]
This bug report was last modified 10 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.