beam: collapse beam_nox into beam_minimal and enable systemd by default (#395352)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user