diff options
Diffstat (limited to 'pkgs/tools/misc/diffoscope/default.nix')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7fe21e8b347..6715f1ac38f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,20 +1,29 @@ -{ 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 }: pythonPackages.buildPythonPackage rec { name = "diffoscope-${version}"; - version = "44"; + version = "45"; namePrefix = ""; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1sisdmh1bl62b16yfjy9mxxdfzhskrabp0l3pl1kxn7db0c4vpac"; + 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" @@ -22,9 +31,11 @@ pythonPackages.buildPythonPackage rec { # Still missing these tools: enjarify otool(maybe OS X only) showttf # Also these libraries: python3-guestfs + # FIXME: move xxd into a separate package so we don't have to pull in all of vim. propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ - [ 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 ]; + [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz + ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root |