public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124797 from NixOS/backport-124790-to-release-21.05

Browse Source 
[Backport release-21.05] diffoscope: 175 -> 176
This commit is contained in:
Maximilian Bosch 2021-05-28 22:08:25 +02:00 committed by GitHub
commit eff32c3626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,11 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "175"; version = "176";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk="; sha256 = "sha256-Hr3GNgpvKCLs+HA8QLOewh5nz9npZr5MZ65wRrat7l0=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -35,10 +35,6 @@ python3Packages.buildPythonApplication rec {
# When generating manpage, use the installed version # When generating manpage, use the installed version
substituteInPlace doc/Makefile --replace "../bin" "$out/bin" 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 ]; nativeBuildInputs = [ docutils help2man installShellFiles ];