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

Merge pull request #77666 from LnL7/darwin-diffoscope

Browse Source 
diffoscope: enable on darwin
This commit is contained in:
Matthieu Coudron 2020-01-14 22:08:42 +01:00 committed by GitHub
commit ece829033b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,11 +35,14 @@ python3Packages.buildPythonApplication rec {
# #
# Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript wasm2wat zipnode # Still missing these tools: abootimg docx2txt dumpxsb enjarify js-beautify lipo oggDump otool procyon-decompiler Rscript wasm2wat zipnode
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm pyxattr ] ++ [ pythonPath = [
acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz libarchive libcaca lz4 pgpdump sng sqlite squashfsTools unzip xxd xz
] ++ lib.optionals enableBloat [ ]
++ (with python3Packages; [ debian libarchive-c python_magic tlsh rpm progressbar33 ])
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
++ lib.optionals enableBloat [
apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick
llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
python3Packages.guestfs python3Packages.guestfs
@ -69,6 +72,6 @@ python3Packages.buildPythonApplication rec {
homepage = https://wiki.debian.org/ReproducibleBuilds; homepage = https://wiki.debian.org/ReproducibleBuilds;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dezgeg ]; maintainers = with maintainers; [ dezgeg ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }