From 3e8a565a04cef3a40dc7b1c29e464a1fc6e00232 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 20 Jul 2017 19:31:08 +0200
Subject: [PATCH] libressl: refactor, drop 2.4, 2.5.4 -> 2.5.5, init 2.6
---
pkgs/development/libraries/libressl/2.4.nix | 22 -----------
pkgs/development/libraries/libressl/2.5.nix | 24 ------------
.../libraries/libressl/default.nix | 39 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 11 ++----
4 files changed, 43 insertions(+), 53 deletions(-)
delete mode 100644 pkgs/development/libraries/libressl/2.4.nix
delete mode 100644 pkgs/development/libraries/libressl/2.5.nix
create mode 100644 pkgs/development/libraries/libressl/default.nix
diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix
deleted file mode 100644
index c5642635b0f0..000000000000
--- a/pkgs/development/libraries/libressl/2.4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- name = "libressl-${version}";
- version = "2.4.5";
-
- src = fetchurl {
- url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
- sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "bin" "dev" "out" "man" ];
-
- 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.5.nix b/pkgs/development/libraries/libressl/2.5.nix
deleted file mode 100644
index 6ab072486553..000000000000
--- a/pkgs/development/libraries/libressl/2.5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- name = "libressl-${version}";
- version = "2.5.4";
-
- src = fetchurl {
- url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
- sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh";
- };
-
- enableParallelBuilding = true;
-
- outputs = [ "bin" "dev" "out" "man" ];
-
- dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
-
- 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/default.nix b/pkgs/development/libraries/libressl/default.nix
new file mode 100644
index 000000000000..4ce1b664725a
--- /dev/null
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+let
+
+ generic = { version, sha256 }: stdenv.mkDerivation rec {
+ name = "libressl-${version}";
+ inherit version;
+
+ src = fetchurl {
+ url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
+ inherit sha256;
+ };
+
+ enableParallelBuilding = true;
+
+ outputs = [ "bin" "dev" "out" "man" ];
+
+ dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
+
+ meta = with stdenv.lib; {
+ description = "Free TLS/SSL implementation";
+ homepage = "http://www.libressl.org";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
+ };
+ };
+
+in {
+
+ libressl_2_5 = generic {
+ version = "2.5.5";
+ sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5";
+ };
+
+ libressl_2_6 = generic {
+ version = "2.6.0";
+ sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4";
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b5824e55732..3297ab19704a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,14 +9601,11 @@ with pkgs;
openslp = callPackage ../development/libraries/openslp {};
- libressl = libressl_2_5;
- libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
- fetchurl = fetchurlBoot;
- };
- libressl_2_5 = callPackage ../development/libraries/libressl/2.5.nix {
- fetchurl = fetchurlBoot;
- };
+ inherit (callPackages ../development/libraries/libressl { })
+ libressl_2_5
+ libressl_2_6;
+ libressl = libressl_2_5;
boringssl = callPackage ../development/libraries/boringssl { };