diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-10 23:51:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-10 23:51:40 +0000 |
| commit | bcefaeea13337208b408e821e2a761978bc63da7 (patch) | |
| tree | 5bd035051ca25e215a8b9ba53eee10e92a8e7948 /pkgs | |
| parent | e3ccebccec96466761ecedb87c508f4c99a23033 (diff) | |
| download | nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar.gz nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar.bz2 nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar.lz nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar.xz nixlib-bcefaeea13337208b408e821e2a761978bc63da7.tar.zst nixlib-bcefaeea13337208b408e821e2a761978bc63da7.zip | |
* Don't use the prerelease of GnuPG by default.
svn path=/nixpkgs/trunk/; revision=34054
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 245292fb10fa..461c70f174a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -774,9 +774,9 @@ let gnupg = callPackage ../tools/security/gnupg { }; - gnupg2_1 = callPackage ../tools/security/gnupg/git.nix { + gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix { libassuan = libassuan2_1; - }; + }); gnuplot = callPackage ../tools/graphics/gnuplot { texLive = null; |