public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14344 from lancelotsix/update_gnupg20

Browse Source 
gnupg20: 2.0.29 -> 2.0.30
This commit is contained in:
Peter Simons 2016-03-31 20:47:32 +02:00
commit 26a73d1f74
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/gnupg/20.nix
View File

@ -12,11 +12,11 @@ with stdenv.lib;
assert x11Support -> pinentry != null; assert x11Support -> pinentry != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnupg-2.0.29"; name = "gnupg-2.0.30";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2"; url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8"; sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
}; };
buildInputs buildInputs

2
pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
View File

@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index 903fb5b..d5611dc 100644 index 903fb5b..d5611dc 100644
--- a/tools/gpgkey2ssh.c --- a/tools/gpgkey2ssh.c
+++ b/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]; keyid = argv[1];
ret = asprintf (&command, ret = asprintf (&command,