summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-05-25 04:36:08 +0200
committerGitHub <noreply@github.com>2021-05-25 04:36:08 +0200
commit3973a5644052ba2145f08820719fda72a36a26c7 (patch)
tree0ba6efb1dc484b2b436c3d807e8ecfd5aaea1e73 /pkgs
parentbbef4537ab5f01bbb35284b60272fafabd0b219c (diff)
parentea55d23cd86edf4b7d06673924284880b8a68f15 (diff)
downloadnixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar.gz
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar.bz2
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar.lz
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar.xz
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.tar.zst
nixpkgs-3973a5644052ba2145f08820719fda72a36a26c7.zip
Merge pull request #124175 from Ma27/fix-diffoscope
Diffstat (limited to 'pkgs')
-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 ];