about summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2019-07-26 12:11:44 +0300
committerNikolay Amiantov <ab@fmap.me>2019-08-01 00:55:35 +0300
commit717b8b3219e0a207e16e28f828f88060b0477d0b (patch)
treefec4aa8017fb64d2c73739be731ddfaa0ec35a4b /nixos/modules/rename.nix
parentca780f4a186ab27425bd57737fe7b9638c2b27a8 (diff)
downloadnixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar.gz
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar.bz2
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar.lz
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar.xz
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.tar.zst
nixlib-717b8b3219e0a207e16e28f828f88060b0477d0b.zip
systemd service: remove generator-packages option
Use systemd.packages instead, it's less error prone and more in line with
what's expected.
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b01febe551f0..e0d64914ef41 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -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" ]