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

diffoscope: 87 -> 90

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-12-26 18:25:27 +02:00
parent e39f211575
commit 355a6ca189
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, python3Packages, docutils { lib, stdenv, fetchgit, python3Packages, docutils, help2man
, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc , acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
@ -8,12 +8,12 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "diffoscope-${version}"; name = "diffoscope-${version}";
version = "87"; version = "90";
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 = "0j3pljwmggrpaghbamvr24x4cg5yj7hl2ll27405p7970scnpngv"; sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704";
}; };
patches = [ patches = [
@ -25,6 +25,8 @@ python3Packages.buildPythonApplication rec {
sed -i setup.py -e "/'rpm-python',/d" sed -i setup.py -e "/'rpm-python',/d"
''; '';
nativeBuildInputs = [ docutils help2man ];
# Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
@ -37,10 +39,12 @@ python3Packages.buildPythonApplication rec {
]; ];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
checkInputs = with python3Packages; [ pytest ];
postInstall = '' postInstall = ''
make -C doc
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 cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {