From a56452799fb7f2632d4f1eea45550ed6a8bc601b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 31 Mar 2025 15:22:22 -0400 Subject: [PATCH] erlang_25: remove as end of life While not technically EOL until the final version of OTP 28 is released, we need to remove prior to branch off for 25.05 as OTP 25 will not be supported for the duration of the release. --- pkgs/top-level/aliases.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/beam-packages.nix | 7 ------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae0a409a1b39..e66aaadc93da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -570,10 +570,11 @@ mapAliases { erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24 erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24 erlangR24_odbc_javac = throw "erlangR24_odbc_javac has been removed in favor of erlang_24_odbc_javac"; # added 2024-05-24 - erlangR25 = throw "erlangR25 has been removed in favor of erlang_25"; # added 2024-05-24 - erlangR25_odbc = throw "erlangR25_odbc has been removed in favor of erlang_25_odbc"; # added 2024-05-24 - erlangR25_javac = throw "erlangR25_javac has been removed in favor of erlang_25_javac"; # added 2024-05-24 - erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed in favor of erlang_25_odbc_javac"; # added 2024-05-24 + erlang_25 = throw "erlang_25 has been removed as it is unmaintained upstream"; # added 2025-03-31 + erlangR25 = throw "erlangR25 has been removed as it is unmaintained upstream"; # added 2024-05-24 + erlangR25_odbc = throw "erlangR25_odbc has been removed as it is unmaintained upstream"; # added 2024-05-24 + erlangR25_javac = throw "erlangR25_javac has been removed as it is unmaintained upstream"; # added 2024-05-24 + erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed as it is unmaintained upstream"; # added 2024-05-24 erlangR26 = throw "erlangR26 has been removed in favor of erlang_26"; # added 2024-05-24 erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24 erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9753eda1b4ac..311046e9a023 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7384,7 +7384,6 @@ with pkgs; erlang_28 erlang_27 erlang_26 - erlang_25 elixir elixir_1_18 elixir_1_17 @@ -7410,13 +7409,11 @@ with pkgs; beamPackages = dontRecurseIntoAttrs beam27Packages; beamMinimalPackages = dontRecurseIntoAttrs beamMinimal27Packages; - beam25Packages = recurseIntoAttrs beam.packages.erlang_25.beamPackages; beam26Packages = recurseIntoAttrs beam.packages.erlang_26.beamPackages; beam27Packages = recurseIntoAttrs beam.packages.erlang_27.beamPackages; # 28 is pre-release beam28Packages = dontRecurseIntoAttrs beam.packages.erlang_28.beamPackages; - beamMinimal25Packages = recurseIntoAttrs beam_minimal.packages.erlang_25.beamPackages; beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26.beamPackages; beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27.beamPackages; # 28 is pre-release diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 55b9d17aa5e3..1ebab1f7c89f 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -46,12 +46,6 @@ in inherit wxSupport systemdSupport; }; - erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { - wxGTK = wxGTK32; - parallelBuild = true; - inherit wxSupport systemdSupport; - }; - # 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_27.elixir`. @@ -78,7 +72,6 @@ in erlang_28 = self.packagesWith self.interpreters.erlang_28; erlang_27 = self.packagesWith self.interpreters.erlang_27; erlang_26 = self.packagesWith self.interpreters.erlang_26; - erlang_25 = self.packagesWith self.interpreters.erlang_25; }; __attrsFailEvaluation = true;