diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 01ab649261e5..7c33178708dd 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,7 +21,8 @@ parallelBuild ? false, systemd, wxSupport ? true, - systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, # systemd support in epmd + # systemd support for epmd + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, # updateScript deps writeScript, common-updater-scripts, @@ -50,6 +51,7 @@ odbcSupport ? false, odbcPackages ? [ unixODBC ], opensslPackage ? openssl, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, wxPackages ? [ libGL libGLU diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0a2d4b040d2..ae0a409a1b39 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -324,6 +324,7 @@ mapAliases { bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17 bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17 BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 + beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01 beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18 betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 @@ -564,6 +565,7 @@ mapAliases { 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 + erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01 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 erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94d3caeddc03..f96fd83a8adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1045,7 +1045,7 @@ with pkgs; }; akkoma = callPackage ../by-name/ak/akkoma/package.nix { - beamPackages = beam_nox.packages.erlang_26.extend ( + beamPackages = beam_minimal.packages.erlang_26.extend ( self: super: { elixir = self.elixir_1_16; rebar3 = self.rebar3WithPlugins { @@ -7373,14 +7373,9 @@ with pkgs; }; beam = callPackage ./beam-packages.nix { }; - beam_nox = callPackage ./beam-packages.nix { - beam = beam_nox; - wxSupport = false; - }; beam_minimal = callPackage ./beam-packages.nix { beam = beam_minimal; wxSupport = false; - systemdSupport = false; }; inherit (beam.interpreters) @@ -7398,8 +7393,6 @@ with pkgs; elixir-ls ; - erlang_nox = beam_nox.interpreters.erlang; - inherit (beam.packages.erlang) erlang-ls ex_doc