diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-10-16 02:00:02 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-10-16 02:00:29 +0200 |
| commit | 45eda176446c30f44dad5f3652f6f8a5a195af1f (patch) | |
| tree | 95b45aa7ee9bb0a2a2f0c41451c0ccfcb33855fb /gnu/packages/patches | |
| parent | 0d2ad16c0714ce62949ef39db673aa2b607c41e3 (diff) | |
| download | guix-45eda176446c30f44dad5f3652f6f8a5a195af1f.tar.gz | |
gnu: diffoscope: Update to 224.
* gnu/packages/diffoscope.scm (diffoscope): Update to 224. * gnu/packages/patches/diffoscope-fix-llvm-test.patch: Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/diffoscope-fix-llvm-test.patch | 11 |
1 files changed, 6 insertions, 5 deletions
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 |