From 2b83f3561f49712f327f5ead0e11ae0e15bffae1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 4 Dec 2015 14:40:08 +0000 Subject: [PATCH 1/2] libassuan: 2.3.0 -> 2.4.2 Version 2.4.0 or higher is required by gpg-2.1.10 --- pkgs/development/libraries/libassuan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 884924f643d..a9c83594179 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.3.0"; + name = "libassuan-2.4.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7"; + sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; }; buildInputs = [ libgpgerror pth ]; From d66d4ca5700a2f78c2c2de83b8c75e79bc913001 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 4 Dec 2015 14:40:54 +0000 Subject: [PATCH 2/2] gnupg21: 2.1.9 -> 2.1.10 See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00001.html for announcement --- pkgs/tools/security/gnupg/21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 5fbd6e83970..f1dcc0e5b20 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.9"; + name = "gnupg-2.1.10"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"; + sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; }; postPatch = stdenv.lib.optionalString stdenv.isLinux ''