diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-16 13:17:57 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-16 13:17:57 +0100 |
| commit | 4d983d4955fcb6eb6b633b216ee0e29839b3b4a5 (patch) | |
| tree | beff564247646cf17057e39247e461b7c66491d5 /modules/system/boot/systemd.nix | |
| parent | ae4e94d9acc510183fab1501bd6e9ed189b31e20 (diff) | |
| download | nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar.gz nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar.bz2 nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar.lz nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar.xz nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.tar.zst nixpkgs-4d983d4955fcb6eb6b633b216ee0e29839b3b4a5.zip | |
Rename ‘system.build.systemd’ to ‘systemd.package’
This makes it cheaper to test a new systemd and is more consistent with other modules.
Diffstat (limited to 'modules/system/boot/systemd.nix')
| -rw-r--r-- | modules/system/boot/systemd.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix index 80957cd1193..b7636702120 100644 --- a/modules/system/boot/systemd.nix +++ b/modules/system/boot/systemd.nix @@ -8,7 +8,7 @@ let cfg = config.systemd; - systemd = pkgs.systemd; + systemd = cfg.package; makeUnit = name: unit: pkgs.runCommand "unit" { inherit (unit) text; } @@ -340,6 +340,12 @@ in options = { + systemd.package = mkOption { + default = pkgs.systemd; + type = types.package; + description = "The systemd package."; + }; + systemd.units = mkOption { description = "Definition of systemd units."; default = {}; @@ -457,8 +463,6 @@ in config = { - system.build.systemd = systemd; - system.build.units = units; environment.systemPackages = [ systemd ]; |