diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-07-25 16:26:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-08-01 00:55:35 +0300 |
| commit | fd405dab3ea0b5a2d3730c836dbcfabf2e820951 (patch) | |
| tree | 9d204afe7fd57d0de68556b37932664d7d241926 /nixos | |
| parent | cc9fb5f0152424e96267a30fd9a9ce35837d9f63 (diff) | |
| download | nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar.gz nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar.bz2 nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar.lz nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar.xz nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.tar.zst nixlib-fd405dab3ea0b5a2d3730c836dbcfabf2e820951.zip | |
systemd service: rename generator-packages
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems/nfs.nix | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4ae642222740..b01febe551f0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -257,6 +257,9 @@ 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" ] diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index cf35504e5182..a89a200960e4 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -497,7 +497,7 @@ in ''; }; - systemd.generator-packages = mkOption { + systemd.generatorPackages = mkOption { default = []; type = types.listOf types.package; example = literalExample "[ pkgs.systemd-cryptsetup-generator ]"; @@ -762,10 +762,10 @@ in environment.etc = let # generate contents for /etc/systemd/system-generators from - # systemd.generators and systemd.generator-packages + # systemd.generators and systemd.generatorPackages generators = pkgs.runCommand "system-generators" { preferLocalBuild = true; - packages = cfg.generator-packages; + packages = cfg.generatorPackages; } '' mkdir -p $out for package in $packages diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index d3a558738f4b..c17cf804950a 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -56,7 +56,7 @@ in boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; systemd.packages = [ pkgs.nfs-utils ]; - systemd.generator-packages = [ pkgs.nfs-utils ]; + systemd.generatorPackages = [ pkgs.nfs-utils ]; environment.etc = { "idmapd.conf".source = idmapdConfFile; |