summary refs log tree commit diff
path: root/pkgs/tools/security/gnupg/21.nix
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
commitf8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch)
tree70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/tools/security/gnupg/21.nix
parent9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff)
parent3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff)
downloadnixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/security/gnupg/21.nix')
-rw-r--r--pkgs/tools/security/gnupg/21.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 0af041e63df9..6119f708070d 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.11";
+  name = "gnupg-2.1.12";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p";
+    sha256 = "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c";
   };
 
   buildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://gnupg.org;
     description = "a complete and free implementation of the OpenPGP standard";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wkennington simons ];
+    maintainers = with maintainers; [ wkennington peti fpletz ];
     platforms = platforms.all;
   };
 }