summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-04-16 08:44:37 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-04-16 08:44:37 +0200
commit5ac500ae685039f0c5faa55bc280a67889aa7f30 (patch)
treeeec17ab632be893c87494c18d0833a5b86231ab2 /pkgs/development
parent8a66effde29458f83ca33527f0a21ab220468bec (diff)
parentf84a2fe412f2db438665c191ee2dac1389676227 (diff)
downloadnixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar.gz
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar.bz2
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar.lz
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar.xz
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.tar.zst
nixlib-5ac500ae685039f0c5faa55bc280a67889aa7f30.zip
Merge #14754: libgcrypt: 1.6.5 -> 1.7.0
http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00005.html
> This is a new stable version of Libgcrypt with full API
> and ABI compatibiliy to the 1.6 series.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libgcrypt/default.nix5
-rw-r--r--pkgs/development/libraries/libressl/2.2.nix2
-rw-r--r--pkgs/development/libraries/libressl/2.3.nix2
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f36113090ce4..d566a0e8567b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -3,11 +3,12 @@
 assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.5";
+  name = "libgcrypt-${version}";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl";
+    sha256 = "14pspxwrqcgfklw3dgmywbxqwdzcym7fznfrqh9rk4vl8jkpxrmh";
   };
 
   outputs = [ "dev" "out" "info" ];
diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
index a3389a49fbc8..09505217ae2d 100644
--- a/pkgs/development/libraries/libressl/2.2.nix
+++ b/pkgs/development/libraries/libressl/2.2.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "dev" "out" "man" "bin" ];
+
   meta = with stdenv.lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "http://www.libressl.org";
diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index 962bb5472636..129456e6657c 100644
--- a/pkgs/development/libraries/libressl/2.3.nix
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  outputs = [ "dev" "out" "man" "bin" ];
+
   meta = with stdenv.lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "http://www.libressl.org";