summary refs log tree commit diff
path: root/pkgs/tools/misc/diffoscope/default.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-05-23 19:08:05 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2021-05-24 11:17:15 +0200
commitea55d23cd86edf4b7d06673924284880b8a68f15 (patch)
treefeb5e1397010b0153500ef7bef7c027ddb98bdd7 /pkgs/tools/misc/diffoscope/default.nix
parent278bcdce1f0da616661a6205161b13bd89a2f3bf (diff)
downloadnixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar.gz
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar.bz2
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar.lz
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar.xz
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.tar.zst
nixpkgs-ea55d23cd86edf4b7d06673924284880b8a68f15.zip
diffoscope: fix build
ZHF #122042
Failing Hydra build: https://hydra.nixos.org/build/143815905

Currently the diff-check for `.mp3`-files is failing. The only reason
for that is that right now is that there are too spaces too much on the
last line[1].

[1] https://salsa.debian.org/reproducible-builds/diffoscope/-/blob/175/tests/data/mp3_expected_diff
Diffstat (limited to 'pkgs/tools/misc/diffoscope/default.nix')
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index ce0d920ca4a..f59e8bb430a 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -35,6 +35,10 @@ python3Packages.buildPythonApplication rec {
 
     # When generating manpage, use the installed version
     substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
+
+    # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/258
+    substituteInPlace tests/data/mp3_expected_diff \
+      --replace "  Stream" "Stream"
   '';
 
   nativeBuildInputs = [ docutils help2man installShellFiles ];