summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libressl/2.2.nix (renamed from pkgs/development/libraries/libressl/default.nix)0
-rw-r--r--pkgs/development/libraries/libressl/2.3.nix20
-rw-r--r--pkgs/top-level/all-packages.nix5
3 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/2.2.nix
index fd18c7f56526..fd18c7f56526 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/2.2.nix
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/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 { };