summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-05 18:36:16 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-05 18:36:16 -0700
commitfbfdc139d68ec27938a41d6957ce1d5e672310e4 (patch)
tree34de541426ca8ad04e8de6fb5a32dd10aab0e354 /pkgs/tools/security
parentd605663ae287ea0f0bfc2e802ae276ab720da71e (diff)
parentcb343e7be6445a643a22992871a76e4911af2c49 (diff)
downloadnixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar.gz
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar.bz2
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar.lz
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar.xz
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.tar.zst
nixlib-fbfdc139d68ec27938a41d6957ce1d5e672310e4.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/gnupg/21.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 34561c3c33dd..8ef96d4d14ea 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.5";
+  name = "gnupg-2.1.6";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m";
+    sha256 = "1zcj5vsrc64zyq7spnx2xlxlq6wxaf5bilpf6gbkp7qr8barlnay";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''