From 144eed8bad6dda707fac78d06f6a0d9e1eb4e933 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 23 Nov 2015 23:04:38 +0000
Subject: libressl: split branches and add 2.3.1 (close #11196)

2.3.x introduces some backward-incompatible changes but is still nice to have.

Both 2.3.1 and 2.2.4 are available and 2.2.4 is still the default for now.
---
 pkgs/development/libraries/libressl/2.2.nix     | 20 ++++++++++++++++++++
 pkgs/development/libraries/libressl/2.3.nix     | 20 ++++++++++++++++++++
 pkgs/development/libraries/libressl/default.nix | 20 --------------------
 pkgs/top-level/all-packages.nix                 |  5 ++++-
 4 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/libressl/2.2.nix
 create mode 100644 pkgs/development/libraries/libressl/2.3.nix
 delete mode 100644 pkgs/development/libraries/libressl/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
new file mode 100644
index 000000000000..fd18c7f56526
--- /dev/null
+++ b/pkgs/development/libraries/libressl/2.2.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libressl-${version}";
+  version = "2.2.4";
+
+  src = fetchurl {
+    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+    sha256 = "0zlsxw366n438dc14zqnim6fc5vh1574jj95hv1sym46prcrhh3b";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Free TLS/SSL implementation";
+    homepage    = "http://www.libressl.org";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice wkennington fpletz ];
+  };
+}
diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
new file mode 100644
index 000000000000..d9981f9b0c52
--- /dev/null
+++ b/pkgs/development/libraries/libressl/2.3.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libressl-${version}";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+    sha256 = "410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Free TLS/SSL implementation";
+    homepage    = "http://www.libressl.org";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ thoughtpolice wkennington fpletz ];
+  };
+}
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
deleted file mode 100644
index fd18c7f56526..000000000000
--- a/pkgs/development/libraries/libressl/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "libressl-${version}";
-  version = "2.2.4";
-
-  src = fetchurl {
-    url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0zlsxw366n438dc14zqnim6fc5vh1574jj95hv1sym46prcrhh3b";
-  };
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Free TLS/SSL implementation";
-    homepage    = "http://www.libressl.org";
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice wkennington fpletz ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47de202e9482..a97bacb779db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7949,7 +7949,10 @@ let
     ffmpeg = ffmpeg_0;
   };
 
-  libressl = callPackage ../development/libraries/libressl { };
+  libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { };
+  libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { };
+  # 2.3 breaks some backward-compability
+  libressl = libressl_2_2;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 
-- 
cgit 1.4.1