From e17c7def698a6efede9fc09e7d6f70e4c467f25c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 18:05:27 +0200 Subject: diffoscope: fix build, 178 -> 179 ChangeLog: https://diffoscope.org/news/diffoscope-179-released/ Also fixed the build by disabling a failing test because of `file-v5.40`[1][2]. [1] Upstream bug: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 [2] Similar to: https://github.com/archlinux/svntogit-community/commit/3f906acae3d3c276bae7ed65727052017be84938 --- pkgs/tools/misc/diffoscope/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 629c8accfb9..d804b5200d2 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "178"; + version = "179"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-uJbTQshf7vRd6EyaaV0itJVrMc/6o+pPXhtUgrjFnzM="; + sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4="; }; outputs = [ "out" "man" ]; @@ -66,6 +66,10 @@ python3Packages.buildPythonApplication rec { "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" + + # Failing because of file-v5.40 has a slightly different output. + # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 + "test_text_proper_indentation" ]; meta = with lib; { -- cgit 1.4.1