diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-17 04:40:27 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-21 01:21:12 +0200 |
| commit | 2a3d8fc70ca7b78fad344b47c659bc70d697f535 (patch) | |
| tree | 099e2b0b42ce715ea26f3b721840d61959ba23d5 /pkgs/tools/misc | |
| parent | 885acea1dd82b0354ff2b6bcf1268b3031cf93df (diff) | |
| download | nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar.gz nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar.bz2 nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar.lz nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar.xz nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.tar.zst nixpkgs-2a3d8fc70ca7b78fad344b47c659bc70d697f535.zip | |
diffoscope: 45 -> 49
We have a new tool dependency for cd-iccdump which comes from the colord package - put this in the bloat category.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6715f1ac38f..4c40afbaa0d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,19 +1,19 @@ { 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 +, acl, binutils, bzip2, cbfstool, cdrkit, colord, 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 = "45"; + version = "49"; namePrefix = ""; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk"; + sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66"; }; patches = @@ -29,13 +29,13 @@ pythonPackages.buildPythonPackage rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify otool(maybe OS X only) showttf + # Still missing these tools: enjarify, otool & lipo (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 gettext gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz - ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root |