summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-07-28 20:36:17 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-07-28 20:36:17 +0200
commit3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59 (patch)
tree4f25fa191dd48878f67b4f04a7c1572e2b01f023 /pkgs/tools
parentfd5bbdb4363cbd2935b0d5a37c4e7355f45e61a4 (diff)
parent49ad8ce561d2c6ae45a178cb431b87ca2b07fb8b (diff)
downloadnixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar.gz
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar.bz2
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar.lz
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar.xz
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.tar.zst
nixlib-3a402e248fb9f5c8fdbe9b8fd1ce43097c709b59.zip
Merge branch 'staging'
It includes a security update of libidn.
Diffstat (limited to 'pkgs/tools')
-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 1266e57e76f3..30ce33bd6a51 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -15,11 +15,11 @@ assert x11Support -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.13";
+  version = "2.1.14";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag";
+    sha256 = "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l";
   };
 
   buildInputs = [