BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #28671 from lsix/update_gpg2

Browse source 
gnupg: 2.1.23 -> 2.2.0
This commit is contained in:
Franz Pletz 2017-08-30 13:06:57 +02:00 committed by GitHub
commit 60bdca87e3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/security/gnupg/21.nix → pkgs/tools/security/gnupg/22.nix
View file

@ -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 = [

4
pkgs/top-level/all-packages.nix
View file

@ -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; };