diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-30 13:06:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-30 13:06:57 +0200 |
commit | 60bdca87e3c014a18188b68848a3a97b6fd96228 (patch) | |
tree | cc5452cea4823f593771f5b747b96b42caddf903 | |
parent | 693d2403f1bf37e2cb4fe45cb949a64344965c18 (diff) | |
parent | 1e5b5bd719b5f712632fde1a2e07f85340fe5d8c (diff) | |
download | nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar.gz nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar.bz2 nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar.lz nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar.xz nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.tar.zst nixlib-60bdca87e3c014a18188b68848a3a97b6fd96228.zip |
Merge pull request #28671 from lsix/update_gpg2
gnupg: 2.1.23 -> 2.2.0
-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.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/22.nix index 1523f3e159ce..3cabf9e1e41b 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 a6692f277c69..c9d455fe31d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2217,10 +2217,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; }; |