diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-10-03 21:37:38 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2023-10-04 04:21:35 -0400 |
| commit | 710b96b191b1585ed655b074879d30313a532c6d (patch) | |
| tree | df6545359fc2ac435d0721e23beecdbd0b1bad83 | |
| parent | 4d29250d5b55fe14280906afad7afacd910850b8 (diff) | |
| download | nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar.gz nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar.bz2 nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar.lz nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar.xz nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.tar.zst nixpkgs-710b96b191b1585ed655b074879d30313a532c6d.zip | |
systemd-stage-1: Default to full systemd build.
| -rw-r--r-- | nixos/modules/profiles/installation-device.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
4 files changed, 7 insertions, 20 deletions
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 19e7eb32e83..52750cd472d 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 ef8204e2cf5..66f8f8ae1b0 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2876,8 +2876,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 b20b0168e40..61af2768e29 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 9718a46468e..5bf8464a4c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28954,20 +28954,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 = |