From bcefaeea13337208b408e821e2a761978bc63da7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 May 2012 23:51:40 +0000 Subject: [PATCH] * Don't use the prerelease of GnuPG by default. svn path=/nixpkgs/trunk/; revision=34054 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 245292fb10f..461c70f174a 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;