From f85cec7548d00058e8e6d8c3eb8627cfd6b321e9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 11 Sep 2023 18:00:06 +0200 Subject: [PATCH] erlang23: remove --- doc/languages-frameworks/beam.section.md | 2 +- pkgs/development/interpreters/erlang/23.nix | 6 ------ pkgs/top-level/aliases.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 17 ----------------- 5 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/23.nix diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 4c1650781f05..5e85723085c1 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -154,7 +154,7 @@ Here is how your `default.nix` file would look for a phoenix project. with import { }; let - # beam.interpreters.erlang_23 is available if you need a particular version + # beam.interpreters.erlang_26 is available if you need a particular version packages = beam.packagesWith beam.interpreters.erlang; pname = "your_project"; diff --git a/pkgs/development/interpreters/erlang/23.nix b/pkgs/development/interpreters/erlang/23.nix deleted file mode 100644 index 89faebdde128..000000000000 --- a/pkgs/development/interpreters/erlang/23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "23.3.4.18"; - sha256 = "sha256-sxNVu/52kOMFKQYPLi5uXnR1mYTF2KlHUo4T7kh0KoY="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 53d38a973ee5..2dce6ddce662 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -488,11 +488,13 @@ mapAliases ({ epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 eql = throw "eql has been removed from nixpkgs, because it depended on qt4. eql5 exists, but is not currently pacakged in nixpkgs."; # added 2022-05-09 - inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21 + inherit (beam.interpreters) erlangR26 erlangR25 erlangR24; # added 2023-03-21 erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21 erlangR21 = erlang_21; erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21 erlangR22 = erlang_22; + erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 + erlangR23 = erlang_23; esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6175abcf6784..256885a8ce95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17821,7 +17821,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_26 erlang_25 erlang_24 erlang_23 + erlang erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e64a06cc3eaa..ff9d1f62ab1f 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,7 +1,6 @@ { lib , beam , callPackage -, openssl_1_1 , wxGTK32 , buildPackages , stdenv @@ -82,21 +81,6 @@ in odbcSupport = true; }; - erlang_23 = self.beamLib.callErlang ../development/interpreters/erlang/23.nix { - openssl = openssl_1_1; - wxGTK = wxGTK32; - # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 - parallelBuild = true; - autoconf = buildPackages.autoconf269; - inherit wxSupport systemdSupport; - }; - erlang_23_odbc = self.interpreters.erlang_23.override { odbcSupport = true; }; - erlang_23_javac = self.interpreters.erlang_23.override { javacSupport = true; }; - erlang_23_odbc_javac = self.interpreters.erlang_23.override { - javacSupport = true; - 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.erlang_24.elixir`. @@ -116,6 +100,5 @@ in erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; - erlang_23 = self.packagesWith self.interpreters.erlang_23; } // packagesAliases; }