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

diffoscope: 29 -> 44

Browse Source 
Relevant changes:
 - Python version switched to Python 3
 - ssdeep library got replaced with tlsh
 - the 'magic' Python package got replaced with a different one
 - Minor build system improvements == less work for us
This commit is contained in:
Tuomas Tynkkynen 2015-09-27 07:10:25 +03:00
parent f5b6ced7ec
commit 7e85fdc6df
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,33 +5,30 @@
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
name = "diffoscope-${version}"; name = "diffoscope-${version}";
version = "29"; version = "44";
namePrefix = ""; namePrefix = "";
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 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf"; sha256 = "1sisdmh1bl62b16yfjy9mxxdfzhskrabp0l3pl1kxn7db0c4vpac";
}; };
postPatch = '' postPatch = ''
# Different pkg name in debian
sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
# Upstream doesn't provide a PKG-INFO file # Upstream doesn't provide a PKG-INFO file
sed -i setup.py -e "/'rpm',/d" sed -i setup.py -e "/'rpm-python',/d"
''; '';
# Still missing these tools: ghc javap showttf sng # Still missing these tools: enjarify ghc img2txt javap otool(maybe OS X only) ppudump showttf sng
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++ # Also these libraries: python3-guestfs
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
[ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ]; gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
postInstall = '' postInstall = ''
mv $out/bin/diffoscope.py $out/bin/diffoscope
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1 ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
''; '';

5
pkgs/top-level/all-packages.nix
View File

@ -1285,7 +1285,10 @@ let
di = callPackage ../tools/system/di { }; di = callPackage ../tools/system/di { };
diffoscope = callPackage ../tools/misc/diffoscope { }; diffoscope = callPackage ../tools/misc/diffoscope {
pythonPackages = python3Packages;
rpm = rpm.override { python = python3; };
};
diffstat = callPackage ../tools/text/diffstat { }; diffstat = callPackage ../tools/text/diffstat { };