diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 3e3f4e8bf4ac5..6c88278def198 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -296,7 +296,7 @@ Usually, we need to create a `shell.nix` file and do our development inside of t with pkgs; let - elixir = beam.packages.erlang_24.elixir_1_18; + elixir = beam.packages.erlang_27.elixir_1_18; in mkShell { buildInputs = [ elixir ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5e07c1a4790e2..65316249e3010 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -347,6 +347,7 @@ mapAliases { epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 + erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24 erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e059a8dbe413d..0950490b692d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7179,7 +7179,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27 erlang_26 erlang_25 erlang_24 + erlang erlang_27 erlang_26 erlang_25 elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir-ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 21581832e189e..1c039da6b96f8 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -28,6 +28,8 @@ in erlang = self.interpreters.${self.latestVersion}; # Standard Erlang versions, using the generic builder. + # + # Three versions are supported according to https://github.com/erlang/otp/security erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { wxGTK = wxGTK32; @@ -51,17 +53,9 @@ in inherit wxSupport systemdSupport; }; - erlang_24 = self.beamLib.callErlang ../development/interpreters/erlang/24.nix { - 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; - }; - # 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`. + # `beam.packages.erlang_27.elixir`. inherit (self.packages.erlang) elixir elixir_1_18 @@ -85,7 +79,6 @@ in erlang_27 = self.packagesWith self.interpreters.erlang_27; erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; - erlang_24 = self.packagesWith self.interpreters.erlang_24; }; __attrsFailEvaluation = true;