diff options
| author | Raito Bezarius <masterancpp@gmail.com> | 2023-03-18 16:13:21 +0100 |
|---|---|---|
| committer | Raito Bezarius <masterancpp@gmail.com> | 2023-03-18 16:13:21 +0100 |
| commit | 5ba52f5c1a57dbf85d631be9317529b3e9d7a6ff (patch) | |
| tree | 489380cba34d26649ed85c51ed01f563ce75563a | |
| parent | Merge pull request #221645 from raboof/doc-stdenv-add-quotes-for-phases-with-... (diff) | |
| download | nixpkgs-origin/diffoscope-unfree.tar.gz | |
diffoscope: move unfree dependencies behind a enableUnfree flagorigin/diffoscope-unfree
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6e9a057af077..2a5d46ab5443 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -3,7 +3,8 @@ , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd -, enableBloat ? false +, enableBloat ? !stdenv.isDarwin +, enableUnfree ? false # updater only , writeScript }: @@ -54,8 +55,9 @@ python3Packages.buildPythonApplication rec { python-magic progressbar33 pypdf2 tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ] + ++ lib.optionals (enableBloat && enableUnfree) [ apktool ] ++ lib.optionals enableBloat ([ - abootimg apksigcopier apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric + abootimg apksigcopier apksigner cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1708180d2d8b..fb92fb2252f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6645,12 +6645,12 @@ with pkgs; diction = callPackage ../tools/text/diction { }; - diffoscopeMinimal = callPackage ../tools/misc/diffoscope { + diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk8; }; - diffoscope = diffoscopeMinimal.override { - enableBloat = !stdenv.isDarwin; + diffoscopeMinimal = diffoscope.override { + enableBloat = false; }; diffr = callPackage ../tools/text/diffr { |