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/applications/virtualization/rkt | |
| 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/applications/virtualization/rkt')
| -rw-r--r-- | pkgs/applications/virtualization/rkt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 42aad06d0c05..0f53ede188ce 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools, +{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools, cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glibc.out glibc.static - autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd + autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd makeWrapper ]; |