diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 51 | ||||
| -rw-r--r-- | gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch | 28 |
2 files changed, 59 insertions, 20 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 35e4783b2a..6e8363d819 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,16 +72,18 @@ (define-public diffoscope (package (name "diffoscope") - (version "177") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02np9dq7jnq48lcmz4k1hvwc6xiqgjhrwr1vsbsfw8rxnp9vs0a5")))) + (version "186") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qlll5jn76ci5jy915v2kvyngfyycwylxpbdylffzaninvdy3dav")) + (patches + (search-patches "diffoscope-fix-test_item3_deflate_llvm_bitcode.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -89,8 +91,7 @@ ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) + (delete-file "tests/comparators/test_berkeley_db.py"))) (add-after 'unpack 'embed-tool-references (lambda* (#:key inputs #:allow-other-keys) (substitute* "diffoscope/comparators/utils/compare.py" @@ -106,27 +107,37 @@ (("\\['stat',") (string-append "['" (which "stat") "',")) (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) + (string-append "['" (which "getfacl") "',"))))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) (add-before 'check 'writable-test-data (lambda _ ;; Tests may need write access to tests directory. - (for-each make-file-writable (find-files "tests")) - #t)) + (for-each make-file-writable (find-files "tests")))) + (add-before 'check 'fix-failing-test + (lambda _ + ;; There is no user name mapping in the build environment. + ;; Pytest made it so much harder than should be necessary, + ;; so I'm leaving… this here in case I ever need it again: + ;; (substitute* "tests/comparators/test_squashfs.py" + ;; (("^def test_symlink_root.*" match) ; no, I don't + ;; (string-append ; know Python + ;; match "\n raise ValueError(" ; why do you + ;; "differences_root[1].unified_diff)\n"))) ; ask + (substitute* "tests/data/squashfs_root_expected_diff" + (("root/root") + '"0/0 ")))) (add-before 'check 'delete-failing-test + ;; Please add new tests to fix-failing-test and not here ;-) (lambda _ ;; This requires /sbin to be in $PATH. - (delete-file "tests/test_tools.py") - #t)) + (delete-file "tests/test_tools.py"))) (add-after 'install 'install-man-page (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1"))) - (install-file "doc/diffoscope.1" man) - #t)))))) + (install-file "doc/diffoscope.1" man))))))) (inputs `(("rpm" ,rpm) ;for rpm-python ("python-debian" ,python-debian) ("python-libarchive-c" ,python-libarchive-c) diff --git a/gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch b/gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch new file mode 100644 index 0000000000..45e496a128 --- /dev/null +++ b/gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch @@ -0,0 +1,28 @@ +From b7eeac09eb068083bdee1a3aa062d1e52a2fa61a Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Mon, 4 Oct 2021 21:03:43 +0200 +Subject: [PATCH] gnu: diffoscope: Fix test_item3_deflate_llvm_bitcode. + +Taken verbatim from Nixpkgs[0]. + +[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 8d201ab..05960aa 100644 +--- a/tests/comparators/test_rlib.py ++++ b/tests/comparators/test_rlib.py +@@ -81,9 +81,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" +- + return get_data(diff_file) + + +-- +2.33.0 |