diff options
| -rw-r--r-- | gnu/packages/diffoscope.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/diffoscope-fix-llvm-test.patch | 11 |
2 files changed, 8 insertions, 7 deletions
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) diff --git a/gnu/packages/patches/diffoscope-fix-llvm-test.patch b/gnu/packages/patches/diffoscope-fix-llvm-test.patch index 45e496a128..1c1c344720 100644 --- a/gnu/packages/patches/diffoscope-fix-llvm-test.patch +++ b/gnu/packages/patches/diffoscope-fix-llvm-test.patch @@ -3,7 +3,7 @@ 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]. +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 --- @@ -11,18 +11,19 @@ Taken verbatim from Nixpkgs[0]. 1 file changed, 3 deletions(-) diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py -index 8d201ab..05960aa 100644 +index 8a20114d..64cea17f 100644 --- a/tests/comparators/test_rlib.py +++ b/tests/comparators/test_rlib.py -@@ -81,9 +81,6 @@ def rlib_dis_expected_diff(): +@@ -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) --- -2.33.0 |