about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2016-03-31 17:16:46 +0200
committerLancelot SIX <lsix@lancelotsix.com>2016-03-31 17:18:32 +0200
commitd6f9e3568307583a2679b212f745691c38d12280 (patch)
tree81f10aa462481ee24e8e5819b03431c6f57b5315 /pkgs/tools
parent594cd3bf5e404dd63bf890d26632f3420f62d04e (diff)
downloadnixlib-d6f9e3568307583a2679b212f745691c38d12280.tar
nixlib-d6f9e3568307583a2679b212f745691c38d12280.tar.gz
nixlib-d6f9e3568307583a2679b212f745691c38d12280.tar.bz2
nixlib-d6f9e3568307583a2679b212f745691c38d12280.tar.lz
nixlib-d6f9e3568307583a2679b212f745691c38d12280.tar.xz
nixlib-d6f9e3568307583a2679b212f745691c38d12280.tar.zst
nixlib-d6f9e3568307583a2679b212f745691c38d12280.zip
gnupg20: 2.0.29 -> 2.0.30
See https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/security/gnupg/20.nix4
-rw-r--r--pkgs/tools/security/gnupg/gpgkey2ssh-20.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 117fc41c1abe..65d43ec9dbee 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.29";
+  name = "gnupg-2.0.30";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
+    sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
   buildInputs
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
index b536a4fe50e3..4bfdc13ef598 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
@@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
 index 903fb5b..d5611dc 100644
 --- a/tools/gpgkey2ssh.c
 +++ b/tools/gpgkey2ssh.c
-@@ -266,7 +266,7 @@ main (int argc, char **argv)
+@@ -268,7 +268,7 @@ main (int argc, char **argv)
    keyid = argv[1];
  
    ret = asprintf (&command,