summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-15 10:30:59 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-15 10:30:59 +0200
commit577d999ea6324da3f2d017101bd1d2aff442f587 (patch)
tree707c64d2c9703f583dd473e53721feb71e5386ca
parent4a513bb101fc6551fe8e233a3bb79566fb182bb7 (diff)
parent201f6600cbe3068144f3dd8ebcefa7192ed5513c (diff)
downloadnixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar.gz
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar.bz2
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar.lz
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar.xz
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.tar.zst
nixlib-577d999ea6324da3f2d017101bd1d2aff442f587.zip
Merge pull request #15448 from joachifm/libksba
libksba: 1.3.3 -> 1.3.4
-rw-r--r--pkgs/development/libraries/libksba/default.nix8
-rw-r--r--pkgs/tools/security/dirmngr/default.nix11
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 26aa974a7eed..9171471882ca 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.3.3";
+  name = "libksba-1.3.4";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc";
+    sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnupg.org;
-    description = "CMS and X.509 access library under development";
+    homepage = https://www.gnupg.org;
+    description = "CMS and X.509 access library";
     platforms = platforms.all;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
index be6d184a4f2c..50eb6750a455 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }:
 
 stdenv.mkDerivation rec {
-  name = "dirmngr-1.0.3";
+  name = "dirmngr-1.1.1";
   src = fetchurl {
-    url = "mirror://gnupg/${name}.tar.bz2";
-    sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
+    url = "mirror://gnupg/dirmngr/${name}.tar.bz2";
+    sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
-
-  buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ];
 }