From 717b8b3219e0a207e16e28f828f88060b0477d0b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 26 Jul 2019 12:11:44 +0300
Subject: systemd service: remove generator-packages option

Use systemd.packages instead, it's less error prone and more in line with
what's expected.
---
 nixos/modules/system/boot/systemd.nix | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'nixos/modules/system')

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 96c4ee30584b..1025a038c4b3 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -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;
-- 
cgit 1.4.1