public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diffoscope: 77 -> 85

Browse Source
This commit is contained in:
Peter Hoeg 2017-08-31 15:53:02 +08:00 committed by Frederik Rietdijk
parent a602e1aa70
commit 90433ed831
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/misc/diffoscope/default.nix
View File

@ -1,24 +1,23 @@
{ lib, stdenv, fetchgit, fetchpatch, python3, docutils { lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils
, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, xxd, xz
, colordiff , colordiff
, enableBloat ? false , enableBloat ? false
}: }:
python3.pkgs.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "diffoscope"; name = "diffoscope-${version}";
name = "${pname}-${version}"; version = "85";
version = "77";
src = fetchgit { src = fetchgit {
url = "git://anonscm.debian.org/reproducible/diffoscope.git"; url = "git://anonscm.debian.org/reproducible/diffoscope.git";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b"; sha256 = "0kmcfhgva1fl6x5b07sc7k6ba9mqs3ma0lvspxm31w7nrrrqcvlr";
}; };
patches = patches = [
[ # Ignore different link counts. # Ignore different link counts - doesn't work with 85
./ignore_links.patch # ./ignore_links.patch
]; ];
postPatch = '' postPatch = ''
@ -28,10 +27,9 @@ python3.pkgs.buildPythonApplication rec {
# Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf # Still missing these tools: enjarify, otool & lipo (maybe macOS only), showttf
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim. pythonPath = with python3Packages;
pythonPath = with python3.pkgs;
[ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext [ debian libarchive-c python_magic tlsh rpm cdrkit acl binutils bzip2 cbfstool cpio diffutils e2fsprogs file gettext
gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff gzip libcaca poppler_utils sng sqlite squashfsTools unzip xxd xz colordiff
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
@ -55,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
''; '';
homepage = https://wiki.debian.org/ReproducibleBuilds; homepage = https://wiki.debian.org/ReproducibleBuilds;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ maintainers.dezgeg ]; maintainers = with maintainers; [ dezgeg ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }