diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 19e7eb32e833..52750cd472da 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -102,8 +102,6 @@ with lib; jq # for closureInfo # For boot.initrd.systemd makeInitrdNGTool - systemdStage1 - systemdStage1Network ]; boot.swraid.enable = true; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index dc24738a3f9d..a5084260daab 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2890,8 +2890,6 @@ let (mkIf cfg.enable { - systemd.package = mkDefault pkgs.systemdStage1Network; - # For networkctl systemd.dbus.enable = mkDefault true; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index b20b0168e40f..61af2768e295 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -135,8 +135,13 @@ in { ''; }; - package = mkPackageOptionMD pkgs "systemd" { - default = "systemdStage1"; + package = lib.mkOption { + type = lib.types.package; + default = config.systemd.package; + defaultText = lib.literalExpression "config.systemd.package"; + description = '' + The systemd package to use. + ''; }; extraConfig = mkOption { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5025012e8c5..2465258dea29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28962,20 +28962,6 @@ with pkgs; withUkify = false; withBootloader = false; }; - systemdStage1 = systemdMinimal.override { - pname = "systemd-stage-1"; - withAcl = true; - withCryptsetup = true; - withFido2 = true; - withKmod = true; - withTpm2Tss = true; - withRepart = true; - }; - systemdStage1Network = systemdStage1.override { - pname = "systemd-stage-1-network"; - withNetworkd = true; - withLibidn2 = true; - }; udev =