Merge pull request #28671 from lsix/update_gpg2

gnupg: 2.1.23 -> 2.2.0

Changed files
+4 -4
pkgs
tools
security
gnupg
top-level
+2 -2
pkgs/tools/security/gnupg/21.nix pkgs/tools/security/gnupg/22.nix
···
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 = [
+2 -2
pkgs/top-level/all-packages.nix
···
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; };