alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

debbindiff: Rename to 'diffoscope' and update 26 -> 29

Browse source 
Upstream has changed the project name to 'diffoscope' since "debbindiff
has grown way beyond a being just a tool to compare Debian packages."

Besides the rename, there are new dependencies on ssdeep, libarchive-c
and sqlite.
This commit is contained in:
Tuomas Tynkkynen 2015-08-04 06:04:12 +03:00
parent 24f76a55d2
commit ba5402a328
3 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/tools/misc/debbindiff/default.nix
View file

@ -1,46 +0,0 @@
{ stdenv, fetchgit, pythonPackages, docutils
, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz
}:
pythonPackages.buildPythonPackage rec {
name = "debbindiff-${version}";
version = "26";
namePrefix = "";
src = fetchgit {
url = "git://anonscm.debian.org/reproducible/debbindiff.git";
rev = "refs/tags/${version}";
sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6";
};
postPatch = ''
# Different pkg name in debian
sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
# Upstream doesn't provide a PKG-INFO file
sed -i setup.py -e "/'rpm',/d"
'';
# Still missing these tools: ghc javap showttf sng
propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++
[ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
postInstall = ''
mv $out/bin/debbindiff.py $out/bin/debbindiff
mkdir -p $out/share/man/man1
${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1
'';
meta = with stdenv.lib; {
description = "Highlight differences between two builds of Debian packages, and even other kind of files";
homepage = https://wiki.debian.org/ReproducibleBuilds;
license = licenses.gpl3Plus;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
}

56
pkgs/tools/misc/diffoscope/default.nix Normal file
View file

@ -0,0 +1,56 @@
{ stdenv, fetchgit, pythonPackages, docutils
, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz
}:
pythonPackages.buildPythonPackage rec {
name = "diffoscope-${version}";
version = "29";
namePrefix = "";
src = fetchgit {
url = "git://anonscm.debian.org/reproducible/diffoscope.git";
rev = "refs/tags/${version}";
sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf";
};
postPatch = ''
# Different pkg name in debian
sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
# Upstream doesn't provide a PKG-INFO file
sed -i setup.py -e "/'rpm',/d"
'';
# Still missing these tools: ghc javap showttf sng
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++
[ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
postInstall = ''
mv $out/bin/diffoscope.py $out/bin/diffoscope
mkdir -p $out/share/man/man1
${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
'';
meta = with stdenv.lib; {
description = "Perform in-depth comparison of files, archives, and directories";
longDescription = ''
diffoscope will try to get to the bottom of what makes files or directories
different. It will recursively unpack archives of many kinds and transform
various binary formats into more human readable form to compare them. It can
compare two tarballs, ISO images, or PDF just as easily. The differences can
be shown in a text or HTML report.
diffoscope is developed as part of the "reproducible builds" Debian
project and was formerly known as "debbindiff".
'';
homepage = https://wiki.debian.org/ReproducibleBuilds;
license = licenses.gpl3Plus;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -1259,8 +1259,6 @@ let
dcfldd = callPackage ../tools/system/dcfldd { };
debbindiff = callPackage ../tools/misc/debbindiff { };
debian_devscripts = callPackage ../tools/misc/debian-devscripts {
inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
};
@ -1303,6 +1301,8 @@ let
di = callPackage ../tools/system/di { };
diffoscope = callPackage ../tools/misc/diffoscope { };
diffstat = callPackage ../tools/text/diffstat { };
diffutils = callPackage ../tools/text/diffutils { };