diff options
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/gpgkey2ssh-21.patch | 13 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index bafcd88f1b90..dc86c6e420ef 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,15 +13,13 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.10"; + name = "gnupg-2.1.11"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; + sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p"; }; - patches = [ ./gpgkey2ssh-21.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch deleted file mode 100644 index 198869423e5c..000000000000 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c -index f12c5f4..2e3f2ac 100644 ---- a/tools/gpgkey2ssh.c -+++ b/tools/gpgkey2ssh.c -@@ -281,7 +281,7 @@ main (int argc, char **argv) - keyid = argv[1]; - - asprintf (&command, -- "gpg2 --list-keys --with-colons --with-key-data '%s'", -+ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'", - keyid); - if (! command) - { |