diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8e5ecbd6a5..3bbcb5e826e 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; };