From 45eda176446c30f44dad5f3652f6f8a5a195af1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:02 +0200 Subject: gnu: diffoscope: Update to 224. * gnu/packages/diffoscope.scm (diffoscope): Update to 224. * gnu/packages/patches/diffoscope-fix-llvm-test.patch: Adjust accordingly. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 27a8aa7b46..f05f60f016 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "221") + (version "224") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b89hygd4m18p3wcx7haz0kwx7gn7irjswxz29lv8sb2r1vqq4za")) + (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) -- cgit v1.2.3 From ad3df339b4858ac7d45ba1086b47a8d37bb85e34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Dec 2022 01:00:02 +0100 Subject: gnu: reprotest: Update to 0.7.22. * gnu/packages/diffoscope.scm (reprotest): Update to 0.7.22. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/diffoscope.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f05f60f016..f730d976fe 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -245,7 +245,7 @@ install.") (define-public reprotest (package (name "reprotest") - (version "0.7.21") + (version "0.7.22") (source (origin (method git-fetch) @@ -254,8 +254,7 @@ install.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1jmnp6dwd91w00vfvph89cvgxwk0nvij8his9az5b72265jf9bxz")))) + (base32 "0qpjg37x2ha7lb113fb5cic5if3zv30zqijsmkq91ld909x30ggd")))) (inputs (list python-debian python-distro python-libarchive-c python-rstr)) (native-inputs @@ -296,8 +295,7 @@ install.") (install-file "doc/reprotest.1" mandir1) (mkdir-p docdir) (install-file "./README.rst" docdir) - (install-file "./README-dev.rst" docdir)) - #t))))) + (install-file "./README-dev.rst" docdir))))))) (home-page "https://salsa.debian.org/reproducible-builds/reprotest") (synopsis "Build software and check it for reproducibility") (description "Reprotest builds the same source code twice in different -- cgit v1.2.3 From eea8a872ff59e9edd2d8c54bac9857aac7a01ff6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 21 Jan 2023 23:06:21 -0800 Subject: gnu: diffoscope: Update to 233. * gnu/packages/diffoscope.scm (diffoscope): Update to 233. [native-inputs]: Add lzip and python-pypdf, drop python-pypdf2. Signed-off-by: Maxim Cournoyer --- gnu/packages/diffoscope.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f730d976fe..6decb86f02 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "224") + (version "233") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qdivsf4yygg2az5018pw0q4169zas3hfqjydd0q3bhdrfpl0q4q")) + (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -160,7 +160,7 @@ python-pytest python-chardet python-h5py - python-pypdf2 + python-pypdf python-progressbar33 abootimg @@ -195,6 +195,7 @@ libarchive llvm-9 lz4 + lzip ocaml odt2txt openssh -- cgit v1.2.3 From e5dc6541fe0e53493289ee32efbd8571f1115470 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Jan 2023 19:46:49 -0500 Subject: gnu: diffoscope: Fix indentation. * gnu/packages/diffoscope.scm (diffoscope): Fix indentation. --- gnu/packages/diffoscope.scm | 150 ++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 75 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 6decb86f02..f2f296b954 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -142,94 +142,94 @@ (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1"))) (install-file "doc/diffoscope.1" man))))))) - (inputs (list rpm ;for rpm-python + (inputs (list rpm ;for rpm-python python-debian python-libarchive-c python-magic python-tlsh - acl ;for getfacl - coreutils ;for stat - diffutils ;for diff + acl ;for getfacl + coreutils ;for stat + diffutils ;for diff xxd)) (native-inputs (append - (list help2man + (list help2man - ;; Below are packages used for tests. - binwalk - python-pytest - python-chardet - python-h5py - python-pypdf - python-progressbar33 + ;; Below are packages used for tests. + binwalk + python-pytest + python-chardet + python-h5py + python-pypdf + python-progressbar33 - abootimg - bdb - binutils - bzip2 - cdrtools - colord - cpio - docx2txt - dtc - e2fsprogs - ffmpeg + abootimg + bdb + binutils + bzip2 + cdrtools + colord + cpio + docx2txt + dtc + e2fsprogs + ffmpeg - ;; XXX: Must be the same version as python-magic uses; - ;; remove when 'file' is updated. - file-next) + ;; XXX: Must be the same version as python-magic uses; + ;; remove when 'file' is updated. + file-next) - (match (%current-system) - ;; fpc is only available on x86 currently. - ((or "x86_64-linux" "i686-linux") - (list fpc)) - (_ '())) + (match (%current-system) + ;; fpc is only available on x86 currently. + ((or "x86_64-linux" "i686-linux") + (list fpc)) + (_ '())) - (list gettext-minimal - ghostscript - `(,giflib "bin") - gnumeric - gnupg - hdf5 - imagemagick - libarchive - llvm-9 - lz4 - lzip - ocaml - odt2txt - openssh - openssl - pgpdump - poppler - python-jsbeautifier - r-minimal - rpm - sng - sqlite - squashfs-tools - tcpdump - unzip - wabt - xxd - xz - zip - zstd) + (list gettext-minimal + ghostscript + `(,giflib "bin") + gnumeric + gnupg + hdf5 + imagemagick + libarchive + llvm-9 + lz4 + lzip + ocaml + odt2txt + openssh + openssl + pgpdump + poppler + python-jsbeautifier + r-minimal + rpm + sng + sqlite + squashfs-tools + tcpdump + unzip + wabt + xxd + xz + zip + zstd) - ;; Also for tests. The test suite skips tests when these are missing. - (match (%current-system) - ;; ghc is only available on x86 currently. - ((or "x86_64-linux" "i686-linux") - (list ghc)) - (_ '())) - (match (%current-system) - ;; openjdk and dependent packages are only - ;; available on x86_64 currently. - ((or "x86_64-linux") - (list enjarify) - ;; No unversioned openjdk available. - (list `(,openjdk12 "jdk"))) - (_ '())))) + ;; Also for tests. The test suite skips tests when these are missing. + (match (%current-system) + ;; ghc is only available on x86 currently. + ((or "x86_64-linux" "i686-linux") + (list ghc)) + (_ '())) + (match (%current-system) + ;; openjdk and dependent packages are only + ;; available on x86_64 currently. + ((or "x86_64-linux") + (list enjarify) + ;; No unversioned openjdk available. + (list `(,openjdk12 "jdk"))) + (_ '())))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description -- cgit v1.2.3 From 2b1e5cb6a82e60298b620ef8d2dbf90cfb925015 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Jan 2023 19:47:22 -0500 Subject: gnu: diffoscope: Simplify the build-man-page phase. * gnu/packages/diffoscope.scm (diffoscope) [phases]: Remove MAKE-FLAGS binding in the build-man-page phase, as the python-build-system has no such argument. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f2f296b954..cb8e9e01b9 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -113,8 +113,8 @@ (("\\[\"getfacl\",") (string-append "[\"" (which "getfacl") "\","))))) (add-after 'build 'build-man-page - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" "-C" "doc" make-flags))) + (lambda _ + (invoke "make" "-C" "doc"))) (add-before 'check 'writable-test-data (lambda _ ;; Tests may need write access to tests directory. -- cgit v1.2.3 From e71dc64e23853b069d861ed1deeeebecda1705e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 25 Jan 2023 09:41:43 +0200 Subject: gnu: diffoscope: Use newer llvm. * gnu/packages/diffoscope.scm (diffoscope)[source]: Remove patch. [native-inputs]: Replace llvm-9 with llvm. * gnu/packages/patches/diffoscope-fix-llvm-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/diffoscope.scm | 8 +++--- .../patches/diffoscope-fix-llvm-test.patch | 29 ---------------------- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/diffoscope-fix-llvm-test.patch (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 310c9f1f90..7fd658abac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1038,7 +1038,6 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ - %D%/packages/patches/diffoscope-fix-llvm-test.patch \ %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index cb8e9e01b9..4c88468c3c 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Vagrant Cascadian -;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022, 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,9 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")) - (patches - (search-patches "diffoscope-fix-llvm-test.patch")))) + (base32 "1m6fc7k8cd7ahra05vqccw1fdbjj6d20vr3q8v67ynnyih5nmbnb")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -193,7 +191,7 @@ hdf5 imagemagick libarchive - llvm-9 + llvm lz4 lzip ocaml diff --git a/gnu/packages/patches/diffoscope-fix-llvm-test.patch b/gnu/packages/patches/diffoscope-fix-llvm-test.patch deleted file mode 100644 index 1c1c344720..0000000000 --- a/gnu/packages/patches/diffoscope-fix-llvm-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b7eeac09eb068083bdee1a3aa062d1e52a2fa61a Mon Sep 17 00:00:00 2001 -From: Tobias Geerinckx-Rice -Date: Mon, 4 Oct 2021 21:03:43 +0200 -Subject: [PATCH] gnu: diffoscope: Fix test_item3_deflate_llvm_bitcode. - -Taken verbatim from Nixpkgs[0]. Later extended for diffoscope >= 224. - -[0]: https://github.com/NixOS/nixpkgs/blob/589e03f109092a3ba97781fd0533110bf78a3f97/pkgs/tools/misc/diffoscope/fix-tests.patch ---- - tests/comparators/test_rlib.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py -index 8a20114d..64cea17f 100644 ---- a/tests/comparators/test_rlib.py -+++ b/tests/comparators/test_rlib.py -@@ -80,12 +80,6 @@ def rlib_dis_expected_diff(): - if actual_ver >= "7.0": - diff_file = "rlib_llvm_dis_expected_diff_7" - -- if actual_ver >= "10.0": -- diff_file = "rlib_llvm_dis_expected_diff_10" -- -- if actual_ver >= "15.0": -- diff_file = "rlib_llvm_dis_expected_diff_15" -- - return get_data(diff_file) - - -- cgit v1.2.3 From b7bff3a76f472d890b548bb54cc206daf2bf7f5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 25 Jan 2023 09:46:37 +0200 Subject: gnu: diffoscope: Replace cdrtools with cdrkit-libre. * gnu/packages/diffoscope.scm (diffoscope)[native-inputs]: Remove cdrtools. Add cdrkit-libre. --- gnu/packages/diffoscope.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 4c88468c3c..0dda89d860 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -165,7 +165,7 @@ bdb binutils bzip2 - cdrtools + cdrkit-libre colord cpio docx2txt -- cgit v1.2.3