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/backup | |
| 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/backup')
| -rw-r--r-- | pkgs/tools/backup/duply/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 0ccc964c3e6a..d476b797f38e 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash +{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash , gnugrep, txt2man, makeWrapper, which }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]} + ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; |