mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues 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-07-26 12:11:44 +03:00
parent ca780f4a18
commit 717b8b3219
4 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/rename.nix
View file

@ -221,6 +221,7 @@ with lib;
(mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")
(mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
(mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")
(mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")
# ZSH
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
@ -257,9 +258,6 @@ with lib;
(mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
(mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
# systemd
(mkRenamedOptionModule [ "systemd" "generator-packages" ] [ "systemd" "generatorPackages" ])
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
"snmpExporter" "unifiExporter" "varnishExporter" ]

25
nixos/modules/system/boot/systemd.nix
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;

1
nixos/modules/tasks/filesystems/nfs.nix
View file

@ -56,7 +56,6 @@ in
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
systemd.packages = [ pkgs.nfs-utils ];
systemd.generatorPackages = [ pkgs.nfs-utils ];
environment.etc = {
"idmapd.conf".source = idmapdConfFile;

1
nixos/modules/tasks/swraid.nix
View file

@ -7,7 +7,6 @@
services.udev.packages = [ pkgs.mdadm ];
systemd.packages = [ pkgs.mdadm ];
systemd.shutdownPackages = [ pkgs.mdadm ];
boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];