MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #140056 from Ma27/bump-diffoscope

Browse source
This commit is contained in:
Sandro 2021-09-30 18:35:56 +02:00 committed by GitHub
commit a6bf86b21c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/misc/diffoscope/default.nix
View file

@ -9,17 +9,22 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "183";
version = "185";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-XFFrRmCpE2UvZRCELfPaotLklyjLiCDWkyFWkISOHZM=";
sha256 = "sha256-Spw7/+vQ1jd3rMZ792du04di0zleRNp8LUEki1374O8=";
};
outputs = [ "out" "man" ];
patches = [
./ignore_links.patch
# due to https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/953a599c2b903298b038b34abf515cea69f4fc19
# the version detection of LLVM is broken and the comparison result is compared against
# the expected result from LLVM 10 (rather than 7 which is our default).
./fix-tests.patch
];
postPatch = ''

14
pkgs/tools/misc/diffoscope/fix-tests.patch Normal file
View file

@ -0,0 +1,14 @@
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)