diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix index 1eba2698ff6f..c2568cc4c6f3 100644 --- a/pkgs/by-name/ak/akkoma/package.nix +++ b/pkgs/by-name/ak/akkoma/package.nix @@ -9,9 +9,9 @@ }: let - beamPackages = beam_minimal.packages.erlang_26.extend ( + beamPackages = beam_minimal.packages.erlang_27.extend ( self: super: { - elixir = self.elixir_1_16; + elixir = self.elixir_1_17; rebar3 = self.rebar3WithPlugins { plugins = with self; [ pc ]; }; diff --git a/pkgs/by-name/pl/pleroma/package.nix b/pkgs/by-name/pl/pleroma/package.nix index 33d206419ef1..35ba807e126a 100644 --- a/pkgs/by-name/pl/pleroma/package.nix +++ b/pkgs/by-name/pl/pleroma/package.nix @@ -16,7 +16,7 @@ }: let - beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = elixir_1_17; }); + beamPackages = beam.packages.erlang_27.extend (self: super: { elixir = elixir_1_17; }); in beamPackages.mixRelease rec { pname = "pleroma"; diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix deleted file mode 100644 index c3de12390853..000000000000 --- a/pkgs/development/interpreters/erlang/26.nix +++ /dev/null @@ -1,6 +0,0 @@ -genericBuilder: - -genericBuilder { - version = "26.2.5.18"; - hash = "sha256-mCkJeRf6PsMsVJXBIpPoHMff5JyVXLSzPzCyLiJtgJo="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b89ce2544678..1718036142fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -661,6 +661,7 @@ mapAliases { eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02 + erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01 esbuild-config = throw "'esbuild-config' has been removed as it has been unmaintained upstream since September 2022"; # Added 2026-02-07 etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08 ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b825be4e14e8..e63029f1fcb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5013,7 +5013,6 @@ with pkgs; erlang erlang_28 erlang_27 - erlang_26 ; inherit (beam.packages.erlang_28.beamPackages) @@ -5029,11 +5028,6 @@ with pkgs; lfe ; - inherit (beam.packages.erlang_26.beamPackages) - elixir_1_16 - elixir_1_15 - ; - inherit (beam.packages.erlang) erlfmt elvis-erlang @@ -5046,12 +5040,10 @@ with pkgs; beamPackages = dontRecurseIntoAttrs beam.packages.erlang.beamPackages; beamMinimalPackages = dontRecurseIntoAttrs beam_minimal.packages.erlang.beamPackages; - beam26Packages = recurseIntoAttrs beam.packages.erlang_26.beamPackages; beam27Packages = recurseIntoAttrs beam.packages.erlang_27.beamPackages; beam28Packages = recurseIntoAttrs beam.packages.erlang_28.beamPackages; beam29Packages = dontRecurseIntoAttrs beam.packages.erlang_29.beamPackages; - beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26.beamPackages; beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27.beamPackages; beamMinimal28Packages = recurseIntoAttrs beam_minimal.packages.erlang_28.beamPackages; beamMinimal29Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_29.beamPackages; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 915424a82a11..694963d069d0 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,5 @@ { + config, lib, beam, callPackage, @@ -46,10 +47,6 @@ in inherit wxSupport systemdSupport; }; - erlang_26 = callErlang ../development/interpreters/erlang/26.nix { - 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`. @@ -76,6 +73,11 @@ in erlang_29 = self.packagesWith self.interpreters.erlang_29; erlang_28 = self.packagesWith self.interpreters.erlang_28; erlang_27 = self.packagesWith self.interpreters.erlang_27; - erlang_26 = self.packagesWith self.interpreters.erlang_26; + } + // lib.optionalAttrs config.allowAliases { + erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01 }; } +// lib.optionalAttrs config.allowAliases { + erlang_26 = throw "'erlang_26' has been removed, as it is EOL"; # added 2026-04-01 +}