about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-05-19 20:58:56 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-05-19 20:58:56 +0000
commitd0b56edcf2d5ddea089bd7ed3c5c90b55aaec458 (patch)
treeb1d9368082112c05c50d55e7f6ccb774a9a61d25 /pkgs/top-level/all-packages.nix
parentea1953d7445ac719db975e6bdaf84e381c6f9803 (diff)
downloadnixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.gz
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.bz2
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.lz
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.xz
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.tar.zst
nixlib-d0b56edcf2d5ddea089bd7ed3c5c90b55aaec458.zip
Mass GnuPG upgrade
gnupg tests fail. Will try to fix later.

svn path=/nixpkgs/trunk/; revision=21884
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e7684554cda..d3f50d6b5f8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -628,6 +628,10 @@ let
       inherit fetchurl stdenv coreutils;
     });
 
+  dirmngr = import ../tools/security/dirmngr {
+    inherit stdenv fetchurl libgpgerror libgcrypt libassuan libksba openldap;
+  };
+
   docbook2x = import ../tools/typesetting/docbook2x {
     inherit fetchurl stdenv texinfo perl
             gnused groff libxml2 libxslt makeWrapper;
@@ -4301,7 +4305,7 @@ let
   };
 
   libassuan = import ../development/libraries/libassuan {
-    inherit fetchurl stdenv pth;
+    inherit fetchurl stdenv pth libgpgerror;
   };
 
   libavc1394 = import ../development/libraries/libavc1394 {