From 14f16986490a91817cdec1a61ea8cc78f5405774 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 8 Dec 2017 12:20:32 +0100 Subject: [PATCH] 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 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" ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f644e8441bb4..62eda4d1aaab 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 e9bcbfa63ec2..7c07c34b2fe9 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;