diff options
| author | Peter Simons <simons@cryp.to> | 2016-03-18 10:12:58 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-03-18 11:06:22 +0100 |
| commit | 9c10ac957dd77e22e9c4f29cd54652d9547c624a (patch) | |
| tree | 439d64495217196b644a62fdc22342a979e15450 | |
| parent | ab450f8477e30b211798de97e197c2e77799acd6 (diff) | |
| download | nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar.gz nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar.bz2 nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar.lz nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar.xz nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.tar.zst nixlib-9c10ac957dd77e22e9c4f29cd54652d9547c624a.zip | |
Update our default version of GnuPG from 2.0.x to 2.1.x.
This patch closes https://github.com/NixOS/nixpkgs/issues/4888.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8e5ecbd6a54..3bbcb5e826ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1780,17 +1780,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; }; |