Update our default version of GnuPG from 2.0.x to 2.1.x.
This patch closes https://github.com/NixOS/nixpkgs/issues/4888.
This commit is contained in:
parent
ab450f8477
commit
9c10ac957d
@ -1780,17 +1780,11 @@ let
|
|||||||
gnupatch = callPackage ../tools/text/gnupatch { };
|
gnupatch = callPackage ../tools/text/gnupatch { };
|
||||||
|
|
||||||
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
|
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
|
||||||
|
|
||||||
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
|
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
|
||||||
|
gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
|
||||||
# use config.packageOverrides if you prefer original gnupg1
|
|
||||||
gnupg1 = gnupg1compat;
|
|
||||||
|
|
||||||
gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
|
gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
|
||||||
|
gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
|
||||||
gnupg21 = lowPrio (callPackage ../tools/security/gnupg/21.nix { });
|
gnupg = gnupg21;
|
||||||
|
|
||||||
gnupg = gnupg20;
|
|
||||||
|
|
||||||
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
|
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user