diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-12-09 14:48:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-09 14:48:56 +0100 |
commit | b2e2490181cbd64fd9e5bdc8aade00222cfe6917 (patch) | |
tree | 8da2b3bbf5e3642605278c298f0fb62044aabbb7 /pkgs/development/interpreters | |
parent | 3e1748f7275aaeee371aeb495f47a27380ef038a (diff) | |
parent | 14f16986490a91817cdec1a61ea8cc78f5405774 (diff) | |
download | nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar.gz nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar.bz2 nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar.lz nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar.xz nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.tar.zst nixlib-b2e2490181cbd64fd9e5bdc8aade00222cfe6917.zip |
Merge pull request #32454 from andir/erlang-cleanup
Erlang cleanup (remove R17, R16 cleanup, updated couchdb to R19)
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 35 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R16B02-basho.nix (renamed from pkgs/development/interpreters/erlang/R16B02-8-basho.nix) | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 37 |
3 files changed, 4 insertions, 76 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix deleted file mode 100644 index 123d813fc77a..000000000000 --- a/pkgs/development/interpreters/erlang/R16.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "16B03-1"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; - }; - - prePatch = '' - sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure - ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; -} diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index 037628a514d4..33c34f7fecc0 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -2,13 +2,13 @@ mkDerivation rec { baseName = "erlang"; - version = "16B02"; + version = "16B02.basho10"; src = pkgs.fetchFromGitHub { owner = "basho"; repo = "otp"; - rev = "OTP_R16B02_basho8"; - sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x"; + rev = "OTP_R16B02_basho10"; + sha256 = "1s2c3ag9dnp6xmcr27kh95n1w50xly97n1mp8ivc2a3gpv4blqmj"; }; preConfigure = '' @@ -27,7 +27,7 @@ mkDerivation rec { installTargets = "install"; postInstall = let manpages = pkgs.fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz"; sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; }; in '' diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix deleted file mode 100644 index 744f905c6577..000000000000 --- a/pkgs/development/interpreters/erlang/R17.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mkDerivation, fetchurl }: - -mkDerivation rec { - version = "17.5"; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w"; - }; - - prePatch = '' - sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure - ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - meta.knownVulnerabilities = [ "CVE-2017-1000385" ]; -} |