nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

diffoscope: 223 -> 224

Browse Source
This commit is contained in:
Sandro Jäckel 2022-10-19 22:06:11 +02:00
parent 66fb0ca69f
commit fd81adec4a
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = ''

33
pkgs/tools/misc/diffoscope/fix-tests.patch
View File

@ -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