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

Merge pull request #11992 from dezgeg/pr-update-diffoscope

Browse Source 
diffoscope: 29 -> 44
This commit is contained in:
Domen Kožar 2015-12-28 07:46:12 +01:00
commit 688ff0c0dc
4 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,37 +1,34 @@
{ stdenv, fetchgit, pythonPackages, docutils { stdenv, fetchgit, pythonPackages, docutils
, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext , acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz , gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
}: }:
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 otool(maybe OS X only) showttf
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++ # Also these libraries: python3-guestfs
[ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ]; [ 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 ];
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/tools/package-management/rpm/default.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-L${elfutils}/lib"; NIX_CFLAGS_LINK = "-L${elfutils}/lib";
postPatch = ''
# For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable}
'';
configureFlags = "--with-external-db --without-lua --enable-python"; configureFlags = "--with-external-db --without-lua --enable-python";
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

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

23
pkgs/top-level/python-packages.nix
View File

@ -21910,6 +21910,29 @@ in modules // {
}; };
}; };
tlsh = buildPythonPackage rec {
name = "tlsh-3.4.1";
src = pkgs.fetchFromGitHub {
owner = "trendmicro";
repo = "tlsh";
rev = "b319aed6a270cc765347296b442820c495018833";
sha256 = "08ysniihvidcyvh9zip64wwvj7mvxvsqs60ci8cxj28f1ip0n8wg";
};
buildInputs = with pkgs; [ cmake ];
preConfigure = ''
mkdir build
cd build
cmake ..
cd ../py_ext
'';
meta = with stdenv.lib; {
description = "Trend Micro Locality Sensitive Hash";
homepage = https://github.com/trendmicro/tlsh;
license = licenses.asl20;
platforms = platforms.linux;
};
};
toposort = buildPythonPackage rec { toposort = buildPythonPackage rec {
name = "toposort-${version}"; name = "toposort-${version}";
version = "1.1"; version = "1.1";