about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLancelot SIX <lsix@lancelotsix.com>2017-08-29 09:03:37 +0200
committerLancelot SIX <lsix@lancelotsix.com>2017-08-30 09:15:02 +0200
commit1e5b5bd719b5f712632fde1a2e07f85340fe5d8c (patch)
tree660cfc4804d7ffd1d7a18fb6c8ec33040f719168
parent16bab456b4fc3c132bdd3cf9173fd43740b0084e (diff)
gnupg: 2.1.23 -> 2.2.0
See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00012.html
for release information
-rw-r--r--pkgs/tools/security/gnupg/22.nix (renamed from pkgs/tools/security/gnupg/21.nix)4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/22.nix
index 1523f3e159cef..3cabf9e1e41b9 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.1.23";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59";
+    sha256 = "1rj538kp3wsdq7rhl8sy1wpwhlsbxcch0cwk64kgz8gpw05lllfl";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af69e1c944ca6..132c3bee5d583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2215,10 +2215,10 @@ with pkgs;
   gnupg20 = callPackage ../tools/security/gnupg/20.nix {
     pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
   };
-  gnupg21 = callPackage ../tools/security/gnupg/21.nix {
+  gnupg22 = callPackage ../tools/security/gnupg/22.nix {
     pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
   };
-  gnupg = gnupg21;
+  gnupg = gnupg22;
 
   gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };