diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-07-31 23:51:34 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-31 23:51:34 +0700 |
commit | e422c1666867969a90e37d2b4d3bd2012365ad79 (patch) | |
tree | a664610895c92814e84f1651fc33ca688eca8531 | |
parent | 67046b5ecdefa6812425aa525b70aac396cf8735 (diff) | |
parent | e17c7def698a6efede9fc09e7d6f70e4c467f25c (diff) | |
download | nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar.gz nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar.bz2 nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar.lz nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar.xz nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.tar.zst nixpkgs-e422c1666867969a90e37d2b4d3bd2012365ad79.zip |
Merge pull request #132228 from Ma27/bump-diffoscope
diffoscope: fix build, 178 -> 179
-rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
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; { |