diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-12 17:00:24 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-01-12 17:01:13 +0100 |
| commit | eda93bb51fe37e27b6932086f3d3a2a35c0d697a (patch) | |
| tree | ad701058c0083098b086752ead26c739b8bffdf0 /pkgs | |
| parent | c311b228fc25fd0b1942cfd8b02c9b53fca50c17 (diff) | |
| download | nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar.gz nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar.bz2 nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar.lz nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar.xz nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.tar.zst nixpkgs-eda93bb51fe37e27b6932086f3d3a2a35c0d697a.zip | |
diffoscope: Ignore different link counts and inode change times
Nix does not canonicalize these, so ignore them to prevent lots of spurious differences.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4a88ddfff14..6715f1ac38f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pythonPackages, docutils +{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1 , gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz , enableBloat ? false @@ -16,6 +16,14 @@ pythonPackages.buildPythonPackage rec { sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk"; }; + patches = + [ # Ignore different link counts and inode change times. + (fetchpatch { + url = https://github.com/edolstra/diffoscope/commit/367f77bba8df0dbc89e63c9f66f05736adf5ec59.patch; + sha256 = "0mnp7icdrjn02dr6f5dwqvvr848jzgkv3cg69a24234y9gxd30ww"; + }) + ]; + postPatch = '' # Upstream doesn't provide a PKG-INFO file sed -i setup.py -e "/'rpm-python',/d" |