From fb9aa8ce6174874cc814ce755c8823860c50f49f Mon Sep 17 00:00:00 2001 From: Thomas Depierre Date: Mon, 27 Jun 2022 18:10:27 +0200 Subject: erlang: remove r16-basho --- .../interpreters/erlang/R16B02-basho.nix | 65 ---------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 9 --- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R16B02-basho.nix diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix deleted file mode 100644 index 69d0ac6b7a5fa..0000000000000 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ pkgs, mkDerivation }: - -mkDerivation { - baseName = "erlang"; - version = "16B02.basho10"; - - src = pkgs.fetchFromGitHub { - owner = "basho"; - repo = "otp"; - rev = "OTP_R16B02_basho10"; - sha256 = "1s2c3ag9dnp6xmcr27kh95n1w50xly97n1mp8ivc2a3gpv4blqmj"; - }; - - preConfigure = '' - export HOME=$PWD/../ - export LANG=C - export ERL_TOP=$(pwd) - sed -e s@/bin/pwd@pwd@g -i otp_build - sed -e s@"/usr/bin/env escript"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc - - ./otp_build autoconf - ''; - - enableHipe = false; - - # Do not install docs, instead use prebuilt versions. - installTargets = "install"; - postInstall = let - manpages = pkgs.fetchurl { - url = "https://www.erlang.org/download/otp_doc_man_R16B02.tar.gz"; - sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p"; - }; - in '' - sed -e s@$(pwd)/bootstrap/bin/escript@$out/bin/escript@g -i $out/lib/erlang/lib/diameter-1.4.3/bin/diameterc - - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - mkdir -p "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - meta = { - homepage = "https://github.com/basho/otp/"; - description = "Programming language used for massively scalable soft real-time systems, Basho fork"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - This version of Erlang is Basho's version, forked from Ericsson's - repository. - ''; - - knownVulnerabilities = [ "CVE-2017-1000385" ]; - - platforms = ["x86_64-linux" "x86_64-darwin"]; - license = pkgs.lib.licenses.asl20; - maintainers = with pkgs.lib.maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990b84e91036..8db017b3991d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14422,7 +14422,7 @@ with pkgs; inherit (beam.interpreters) erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21 - erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 + erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e7f4b6b5250f5..714873775269a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -92,15 +92,6 @@ with beam; { odbcSupport = true; }; - # Basho fork, using custom builder. - erlang_basho_R16B02 = - lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { - autoconf = buildPackages.autoconf269; - inherit wxSupport; - }; - erlang_basho_R16B02_odbc = - erlang_basho_R16B02.override { odbcSupport = true; }; - # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR24.elixir`. -- cgit 1.4.1