colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libressl: refactor, drop 2.4, 2.5.4 -> 2.5.5, init 2.6

Browse Source
This commit is contained in:
Franz Pletz 2017-07-20 19:31:08 +02:00
parent 31437ccf7a
commit 3e8a565a04
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
4 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/libressl/2.4.nix
View File

@ -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 ];
};
}

24
pkgs/development/libraries/libressl/2.5.nix
View File

@ -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 ];
};
}

39
pkgs/development/libraries/libressl/default.nix Normal file
View File

@ -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";
};
}

11
pkgs/top-level/all-packages.nix
View File

@ -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 { };