diff options
author | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-08-03 13:34:44 +0000 |
commit | 1b979d83845945dabffebff5033cf864b41d5c64 (patch) | |
tree | 6e81ba4ab8cd28ad9fc8d9e2a3a298bc5a403042 /pkgs/development/libraries/libressl | |
parent | 3f9e8601f2a8537de90f04375400538049bbdaf2 (diff) | |
parent | d93f917182dc5da7aca53fb9a847374ec0c7429a (diff) | |
download | nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.gz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.bz2 nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.lz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.xz nixlib-1b979d83845945dabffebff5033cf864b41d5c64.tar.zst nixlib-1b979d83845945dabffebff5033cf864b41d5c64.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/libressl')
-rw-r--r-- | pkgs/development/libraries/libressl/2.2.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/libressl/2.3.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libressl/2.4.nix | 4 |
3 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix deleted file mode 100644 index 93d61b6a4bb6..000000000000 --- a/pkgs/development/libraries/libressl/2.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.2.9"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0i2cbkj07kcs2is8k8wirvywg4az3wk4s3q1slwp4qw3x9vz63vi"; - }; - - enableParallelBuilding = true; - - outputs = [ "dev" "out" "man" "bin" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index a143547ca04a..fed460a134be 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1yipsp1ici207nbminbf1knh252kzvqg036v0xpx0fw1wrwlg2im"; + sha256 = "0q08yysyalz0fvzajm3x4wg4k6gn4hhd04qsfv27r1p4kj2mv7zm"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index e9e0b350473d..332102658f9a 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0xq4x1s91aqzrf8j9d4kf4j093cz2ayg0xrybsl4gkb966qj468j"; + sha256 = "1qyrcyzrrn6r9cqvm66ib72qyr65q4hrdyiq1vb24a6nwmwdg1sz"; }; enableParallelBuilding = true; |