diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-10-19 22:06:11 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-10-19 22:06:37 +0200 |
| commit | fd81adec4a5baba3286e64c3c9824690ce9cb5b4 (patch) | |
| tree | 7d9e6c719d16363da034dcd11fcba311ea9256ff /pkgs/tools/misc/diffoscope | |
| parent | 66fb0ca69f47d7f74012923857fad85915d993e1 (diff) | |
diffoscope: 223 -> 224
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/misc/diffoscope/fix-tests.patch | 33 |
2 files changed, 2 insertions, 40 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 3884807bd7196..9dde5aad2b2df 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,22 +11,17 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "223"; + version = "224"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-9QyMTYqaxRnVonVedLDGOgeK9/j39//zkzta9ngcNro="; + sha256 = "sha256-rbfXQJJjPZAtoYbrpJczR5Gft+SeGoo6xjZvgwI+l1g="; }; 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 = '' diff --git a/pkgs/tools/misc/diffoscope/fix-tests.patch b/pkgs/tools/misc/diffoscope/fix-tests.patch deleted file mode 100644 index 7e643f61b0a8c..0000000000000 --- a/pkgs/tools/misc/diffoscope/fix-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -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) - - -diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff -index 7e90e428..9628efa0 100644 ---- a/tests/data/pgp_signed_expected_diff -+++ b/tests/data/pgp_signed_expected_diff -@@ -5,11 +5,11 @@ - Key ID - 0x1E953E27D4311E58 - Next packet - other than one pass signature - Old: Literal Data Packet(tag 11)(10255 bytes) -- Format - binary -+ Packet data format - binary - - Filename - test1.tar --- File modified time - Tue Aug 25 11:47:35 UTC 2020 -+- Creation time - Tue Aug 25 11:47:35 UTC 2020 - + Filename - test2.tar --+ File modified time - Tue Aug 25 11:47:38 UTC 2020 -++ Creation time - Tue Aug 25 11:47:38 UTC 2020 - Literal - ... - Old: Signature Packet(tag 2)(563 bytes) - Ver 4 - new |