diff options
| author | Louis Taylor <louis@kragniz.eu> | 2016-02-02 15:29:34 +0000 |
|---|---|---|
| committer | Louis Taylor <louis@kragniz.eu> | 2016-02-02 15:37:10 +0000 |
| commit | b2609751e4eb190a56244a7b828f957ca95eb517 (patch) | |
| tree | 41b6f7217bc0b729f8e5a8e47d2407ebd8a94312 /pkgs/tools/security | |
| parent | a7662bdc91e88c7e6bc94dab9067978ba4f3c9d1 (diff) | |
| download | nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar.gz nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar.bz2 nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar.lz nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar.xz nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.tar.zst nixlib-b2609751e4eb190a56244a7b828f957ca95eb517.zip | |
gnupg: 2.1.10 -> 2.1.11
Release notes can be found here:
https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000383.html
Diffstat (limited to 'pkgs/tools/security')
| -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) - { |