about summary refs log tree commit diff
path: root/pkgs/tools/misc/diffoscope
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-12-11 14:02:17 +0100
committerMichael Weiss <dev.primeos@gmail.com>2021-12-11 14:04:04 +0100
commit0ba695d90eff1a5a16e609f353af8c1d5d5c1497 (patch)
tree0f1a9c7e639d2632fba4de2c5963c7d6e8aff3cc /pkgs/tools/misc/diffoscope
parent1b11583dfb3ea76e357a61519ce4080281365283 (diff)
diffoscope: Fix the OpenPGP test which broke with pgpdump 0.34
This fixes a regression from the last pgpdump update: 816d311bd07
See https://github.com/NixOS/nixpkgs/pull/149700#issuecomment-991592708

Reported-by: Sergei Trofimovich <slyich@gmail.com>
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
-rw-r--r--pkgs/tools/misc/diffoscope/fix-tests.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/tools/misc/diffoscope/fix-tests.patch b/pkgs/tools/misc/diffoscope/fix-tests.patch
index b5566cb932f78..7e643f61b0a8c 100644
--- a/pkgs/tools/misc/diffoscope/fix-tests.patch
+++ b/pkgs/tools/misc/diffoscope/fix-tests.patch
@@ -12,3 +12,22 @@ index 8d201ab..05960aa 100644
      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