From 9cfcf90832da5fe2da6d33b4213fa6e11906ebe7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 2 Aug 2016 18:48:43 +0200
Subject: [PATCH] libressl: 2.3.6 -> 2.3.7, 2.4.1 -> 2.4.2
Version 2.2.x is removed because it is not maintained by upstream anymore.
---
pkgs/development/libraries/libressl/2.2.nix | 22 ---------------------
pkgs/development/libraries/libressl/2.3.nix | 4 ++--
pkgs/development/libraries/libressl/2.4.nix | 4 ++--
pkgs/top-level/all-packages.nix | 5 +----
4 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 pkgs/development/libraries/libressl/2.2.nix
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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aaeb9e095dc..37675e669508 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8923,10 +8923,7 @@ in
openslp = callPackage ../development/libraries/openslp {};
- libressl = self.libressl_2_3;
- libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix {
- fetchurl = fetchurlBoot;
- };
+ libressl = self.libressl_2_4;
libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix {
fetchurl = fetchurlBoot;
};