diff mbox series

[bug#70428] Update diffoscope to 264 and reprotest to 0.7.27

Message ID 87cyqm1w1h.fsf@wireframe
State New
Headers show
Series [bug#70428] Update diffoscope to 264 and reprotest to 0.7.27 | expand

Commit Message

Vagrant Cascadian April 18, 2024, 4:21 p.m. UTC 
Try again, with patches in separate emails...
diff mbox series

Patch

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

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