diff mbox series

[bug#71024] Update diffoscope to 267 (with xz bonus update)

Message ID 87le47rikz.fsf@wireframe
State New
Headers
Series [bug#71024] Update diffoscope to 267 (with xz bonus update) |

Commit Message

Vagrant Cascadian May 18, 2024, 1:53 a.m. UTC

Comments

Vagrant Cascadian May 18, 2024, 2:01 a.m. UTC | #1 
On 2024-05-17, Vagrant Cascadian wrote:
> * gnu/packages/diffoscope.scm (diffoscope): Update to 267.
> [native-inputs]: Use xz-5.4.

I should probably mention the related upstream diffoscope bug somewhere:

  https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/374

Other options would be to monkey-patch to skip the test when the xz
version is not sufficient or something similar.

live well,
  vagrant
Maxim Cournoyer May 21, 2024, 2:48 a.m. UTC | #2 
Hi,

Vagrant Cascadian <vagrant@reproducible-builds.org> writes:

> From a889aaf43ee1d3cc9669bcc80888450bbd3d9ca1 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@reproducible-builds.org>
> Date: Fri, 17 May 2024 17:18:39 -0700
> Subject: [PATCH 2/2] gnu: diffoscope: Update to 267.
>
> * gnu/packages/diffoscope.scm (diffoscope): Update to 267.
> [native-inputs]: Use xz-5.4.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

LGTM, but I think it's safe to use xz 5.6.1 *from git*, unless I've
missed recent development on the xz backdoor story.
diff mbox series

Patch

From a889aaf43ee1d3cc9669bcc80888450bbd3d9ca1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 17 May 2024 17:18:39 -0700
Subject: [PATCH 2/2] gnu: diffoscope: Update to 267.

* gnu/packages/diffoscope.scm (diffoscope): Update to 267.
[native-inputs]: Use xz-5.4.
---
 gnu/packages/diffoscope.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d..83c8f84967 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 "265")
+    (version "267")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@  (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0fdaxihmzz1jf9ay8pwr1z60b2rnihawp4js4nw9l7wv0gij9vpg"))))
+        (base32 "19iyx846rrz5j8fx4q9sx4p3mr8h7g7190ayjmzl8hr2y9knmy74"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -219,7 +219,7 @@  (define (bin command)
             unzip
             wabt
             xxd
-            xz
+            xz-5.4 ; tests require newer version
             zip
             zstd)
 
-- 
2.39.2