From 258186571721b4938822b02dd518c9295153f1f4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 14 Sep 2017 15:25:08 +0300 Subject: [PATCH] diffoscope: Add even more tools --- pkgs/tools/misc/diffoscope/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 13d1b149d06..2de8ceb6893 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, python3Packages, docutils -, acl, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc, e2fsprogs -, file, findutils, fpc, gettext, ghc, gnupg1, gnutar, gzip, imagemagick, jdk, libarchive, libcaca, llvm -, mono, openssh, pdftk, poppler_utils, sng, sqlite, squashfsTools, tcpdump, unzip, xxd, xz +, acl, apktool, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc +, 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 +, squashfsTools, tcpdump, unoconv, unzip, xxd, xz , enableBloat ? false }: @@ -24,13 +25,13 @@ python3Packages.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: apktool docx2txt enjarify gifbuild js-beautify odt2txt oggDump pgpdump ps2ascii Rscript showttf + # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ - acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file - findutils gettext gnutar gzip libarchive libcaca poppler_utils sng sqlite squashfsTools unzip - xxd xz - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump ]; + acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils + fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump poppler_utils sng sqlite + squashfsTools unzip xxd xz + ] ++ lib.optionals enableBloat [ apktool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump unoconv ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root