diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-04 20:59:29 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-04 21:21:11 +0200 |
commit | 9f55a39cf19dab41cfe7198b35a6c62a2270fb0d (patch) | |
tree | d4cdba9d0b18c8af1a57bfefc941c0eed6245c8e /gnu/packages/patches | |
parent | 5a1aa90775a36c23cf94a3b1f6b52f9ceed2c288 (diff) | |
download | guix-9f55a39cf19dab41cfe7198b35a6c62a2270fb0d.tar.gz guix-9f55a39cf19dab41cfe7198b35a6c62a2270fb0d.zip |
gnu: diffoscope: Update to 186.
* gnu/packages/diffoscope.scm (diffoscope): Update to 186.
[source]: Add patch.
[arguments]: Add a new 'fix-failing-tests phase.
Don't explicitly return #t from phases.
* gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 |