types.optionSet: deprecate and remove last usages

2019-01-31 00:41:10 +02:00
parent aa2e63ce5e
commit 27982b408e
10 changed files with 45 additions and 55 deletions
@@ -92,23 +92,24 @@ let
      exit($mainRes & 127 ? 255 : $mainRes << 8);
    '';

+  opts = { config, name, ... }: {
+    options.runner = mkOption {
+    internal = true;
+    description = ''
+        A script that runs the service outside of systemd,
+        useful for testing or for using NixOS services outside
+        of NixOS.
+    '';
+    };
+    config.runner = makeScript name config;
+  };
+
 in

 {
  options = {
    systemd.services = mkOption {
-      options =
-        { config, name, ... }:
-        { options.runner = mkOption {
-            internal = true;
-            description = ''
-              A script that runs the service outside of systemd,
-              useful for testing or for using NixOS services outside
-              of NixOS.
-            '';
-          };
-          config.runner = makeScript name config;
-        };
+      type = with types; attrsOf (submodule opts);
    };
  };
 }