diff options
| author | Spencer Baugh <sbaugh@catern.com> | 2019-03-20 18:23:30 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-05-12 20:08:50 +0200 |
| commit | 4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f (patch) | |
| tree | ed1f58c306c4581feab999cfa289c97a3755fde1 /pkgs/tools/misc/diffoscope | |
| parent | 147621f7db67344b781c6626b88ff6d0bad7aa70 (diff) | |
| download | nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar.gz nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar.bz2 nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar.lz nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar.xz nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.tar.zst nixlib-4b8803dae630d6bfa7ba5c9b74eb46e82b7a368f.zip | |
switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra symlinks in the bin directory. None of these packages need those symlinks, and it's confusing for them to say they're depending on "gnupg1", so switch their dep to plain "gnupg".
Diffstat (limited to 'pkgs/tools/misc/diffoscope')
| -rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b4272dac5317..22da00da9fca 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, python3Packages, docutils, help2man , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar +, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , squashfsTools, tcpdump, unoconv, unzip, xxd, xz , enableBloat ? false @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ - apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick + apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv python3Packages.guestfs ]; |