From b8b4d7ebf2eaef7dcf092ea119826f3f357a165b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 8 Dec 2017 15:00:21 +0100 Subject: [PATCH 1/4] erlang: removed R16.nix, was a leftover from #32443 --- pkgs/development/interpreters/erlang/R16.nix | 35 -------------------- 1 file changed, 35 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R16.nix diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix deleted file mode 100644 index 123d813fc77..00000000000 --- 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 - ''; -} From 8e2f11ee511c3da84f0598e09f547599d6a0622e Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 8 Dec 2017 14:31:09 +0100 Subject: [PATCH 2/4] couchdb: use erlangR19 instead of erlangR17 erlangR17 is no longer receiving any kind of (security) patches, switching to R19 should be fine as per the couchdb documentation [1] [1] http://docs.couchdb.org/en/2.1.1/install/unix.html#dependencies --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27bc072bda7..f644e8441bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11557,7 +11557,7 @@ with pkgs; spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; - erlang = erlangR17; + erlang = erlangR19; }; couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { From 9f39d0ef68b7dd4748de2868138e2bfdd01d7812 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 8 Dec 2017 14:19:49 +0100 Subject: [PATCH 3/4] erlang_basho_R16B02: OTP_16B02_basho8 -> OTP_16B02_basho10 Also renamed the file since it is no longer version 8. --- .../erlang/{R16B02-8-basho.nix => R16B02-basho.nix} | 8 ++++---- pkgs/top-level/beam-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/interpreters/erlang/{R16B02-8-basho.nix => R16B02-basho.nix} (90%) diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix similarity index 90% rename from pkgs/development/interpreters/erlang/R16B02-8-basho.nix rename to pkgs/development/interpreters/erlang/R16B02-basho.nix index 037628a514d..33c34f7fecc 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/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8a63dcc1a4f..e9bcbfa63ec 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -49,8 +49,8 @@ rec { }; erlangR20_nox = erlangR20.override { wxSupport = false; }; - # Bash fork, using custom builder. - erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { + # Basho fork, using custom builder. + erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; From 14f16986490a91817cdec1a61ea8cc78f5405774 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 8 Dec 2017 12:20:32 +0100 Subject: [PATCH 4/4] erlangR17: removed outdated & unused version erlangR17 doesn't receive any upstream updates anymore and none of our packages depend on it. --- pkgs/development/interpreters/erlang/R17.nix | 37 -------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 8 ----- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R17.nix diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix deleted file mode 100644 index 744f905c657..00000000000 --- 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" ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f644e8441bb..62eda4d1aaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6477,7 +6477,7 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR17 erlangR18 erlangR19 erlangR20 + erlang erlangR18 erlangR19 erlangR20 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e9bcbfa63ec..7c07c34b2fe 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -14,13 +14,6 @@ rec { erlang_nox = erlangR19_nox; # These are standard Erlang versions, using the generic builder. - erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {}; - erlangR17_odbc = erlangR17.override { odbcSupport = true; }; - erlangR17_javac = erlangR17.override { javacSupport = true; }; - erlangR17_odbc_javac = erlangR17.override { - javacSupport = true; odbcSupport = true; - }; - erlangR17_nox = erlangR17.override { wxSupport = false; }; erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; }; @@ -73,7 +66,6 @@ rec { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; - erlangR17 = packagesWith interpreters.erlangR17; erlangR18 = packagesWith interpreters.erlangR18; erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20;