public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd service: remove generator-packages option

Browse Source 
Use systemd.packages instead, it's less error prone and more in line with
what's expected.
This commit is contained in:
Nikolay Amiantov
2019-08-01 00:55:35 +03:00
parent ca780f4a18
commit 717b8b3219
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/systemd.nix
+6 -19
View File
@@ -427,7 +427,8 @@ in
systemd.packages = mkOption {
default = [];
type = types.listOf types.package;
description = "Packages providing systemd units.";
example = literalExample "[ pkgs.systemd-cryptsetup-generator ]";
description = "Packages providing systemd units and hooks.";
};
systemd.targets = mkOption {
@@ -497,13 +498,6 @@ in
'';
};
systemd.generatorPackages = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.systemd-cryptsetup-generator ]";
description = "Packages providing systemd generators.";
};
systemd.shutdown = mkOption {
type = types.attrsOf types.path;
default = {};
@@ -514,13 +508,6 @@ in
'';
};
systemd.shutdownPackages = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.mdadm ]";
description = "Packages providing systemd shutdown executables.";
};
systemd.defaultUnit = mkOption {
default = "multi-user.target";
type = types.str;
@@ -779,9 +766,9 @@ in
environment.etc = let
# generate contents for /etc/systemd/system-${type} from attrset of links and packages
hooks = type: links: packages: pkgs.runCommand "system-${type}" {
hooks = type: links: pkgs.runCommand "system-${type}" {
preferLocalBuild = true;
packages = packages;
packages = cfg.packages;
} ''
set -e
mkdir -p $out
@@ -854,8 +841,8 @@ in
${concatStringsSep "\n" cfg.tmpfiles.rules}
'';
"systemd/system-generators" = { source = hooks "generators" cfg.generators cfg.generatorPackages; };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown cfg.shutdownPackages; };
"systemd/system-generators" = { source = hooks "generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
});
services.dbus.enable = true;