public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14012 from peti/update-gnupg

Browse Source 
Update default version of gnupg to 2.1.x
This commit is contained in:
zimbatm
2016-03-20 00:05:15 +00:00
parent 9b8b143c99 5391882ebd
commit 008f170bcb
5 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@@ -1784,17 +1784,11 @@ let
gnupatch = callPackage ../tools/text/gnupatch { };
gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
# use config.packageOverrides if you prefer original gnupg1
gnupg1 = gnupg1compat;
gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
gnupg21 = lowPrio (callPackage ../tools/security/gnupg/21.nix { });
gnupg = gnupg20;
gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
gnupg = gnupg21;
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };