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. --- .../patches/diffoscope-fix-llvm-test.patch | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 gnu/packages/patches/diffoscope-fix-llvm-test.patch (limited to 'gnu/packages/patches') 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