Fix bogus mkOption types

Among others, systemd unit options were not being type-checked because
of this.  mkOption should really check its arguments better...

nixos/modules/services/monitoring/graphite.nix

@@ -32,13 +32,13 @@ in {
       host = mkOption {
         description = "Graphite web frontend listen address";
         default = "127.0.0.1";
-        types = type.uniq types.string;
+        type = types.uniq types.string;
       };
 
       port = mkOption {
         description = "Graphite web frontend port";
         default = "8080";
-        types = type.uniq types.string;
+        type = types.uniq types.string;
       };
     };
 

nixos/modules/services/search/elasticsearch.nix

@@ -29,31 +29,31 @@ in {
     host = mkOption {
       description = "Elasticsearch listen address";
       default = "127.0.0.1";
-      types = type.uniq types.string;
+      type = types.uniq types.string;
     };
 
     port = mkOption {
       description = "Elasticsearch port to listen for HTTP traffic";
       default = "9200";
-      types = type.uniq types.string;
+      type = types.uniq types.string;
     };
 
     tcp_port = mkOption {
       description = "Elasticsearch port for the node to node communication";
       default = "9300";
-      types = type.uniq types.string;
+      type = types.uniq types.string;
     };
 
     cluster_name = mkOption {
       description = "Elasticsearch name that identifies your cluster for auto-discovery";
       default = "elasticsearch";
-      types = type.uniq types.string;
+      type = types.uniq types.string;
     };
 
     extraConf = mkOption {
       description = "Extra configuration for elasticsearch";
       default = "";
-      types = type.uniq types.string;
+      type = types.uniq types.string;
       example = ''
         node.name: "elasticsearch"
         node.master: true
@@ -77,7 +77,7 @@ in {
               type: consolePattern
               conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
       '';
-      types = type.uniq types.string;
+      type = types.uniq types.string;
     };
   };
 

nixos/modules/system/boot/systemd-unit-options.nix

@@ -8,7 +8,7 @@ rec {
 
     enable = mkOption {
       default = true;
-      types = types.bool;
+      type = types.bool;
       description = ''
         If set to false, this unit will be a symlink to
         /dev/null. This is primarily useful to prevent specific
@@ -19,13 +19,13 @@ rec {
 
     description = mkOption {
       default = "";
-      types = types.uniq types.string;
+      type = types.uniq types.string;
       description = "Description of this unit used in systemd messages and progress indicators.";
     };
 
     requires = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         Start the specified units when this unit is started, and stop
         this unit when the specified units are stopped or fail.
@@ -34,7 +34,7 @@ rec {
 
     wants = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         Start the specified units when this unit is started.
       '';
@@ -42,7 +42,7 @@ rec {
 
     after = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         If the specified units are started at the same time as
         this unit, delay this unit until they have started.
@@ -51,7 +51,7 @@ rec {
 
     before = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         If the specified units are started at the same time as
         this unit, delay them until this unit has started.
@@ -60,7 +60,7 @@ rec {
 
     bindsTo = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         Like ‘requires’, but in addition, if the specified units
         unexpectedly disappear, this unit will be stopped as well.
@@ -69,7 +69,7 @@ rec {
 
     partOf = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         If the specified units are stopped or restarted, then this
         unit is stopped or restarted as well.
@@ -78,7 +78,7 @@ rec {
 
     conflicts = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = ''
         If the specified units are started, then this unit is stopped
         and vice versa.
@@ -87,13 +87,13 @@ rec {
 
     requiredBy = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = "Units that require (i.e. depend on and need to go down with) this unit.";
     };
 
     wantedBy = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       description = "Units that want (i.e. depend on) this unit.";
     };
 
@@ -250,7 +250,7 @@ rec {
 
     listenStreams = mkOption {
       default = [];
-      types = types.listOf types.string;
+      type = types.listOf types.string;
       example = [ "0.0.0.0:993" "/run/my-socket" ];
       description = ''
         For each item in this list, a <literal>ListenStream</literal>

nixos/modules/system/boot/systemd.nix

@@ -389,12 +389,12 @@ in
       type = types.attrsOf types.optionSet;
       options = {
         text = mkOption {
-          types = types.uniq types.string;
+          type = types.uniq types.string;
           description = "Text of this systemd unit.";
         };
         enable = mkOption {
           default = true;
-          types = types.bool;
+          type = types.bool;
           description = ''
             If set to false, this unit will be a symlink to
             /dev/null. This is primarily useful to prevent specific
@@ -404,12 +404,12 @@ in
         };
         requiredBy = mkOption {
           default = [];
-          types = types.listOf types.string;
+          type = types.listOf types.string;
           description = "Units that require (i.e. depend on and need to go down with) this unit.";
         };
         wantedBy = mkOption {
           default = [];
-          types = types.listOf types.string;
+          type = types.listOf types.string;
           description = "Units that want (i.e. depend on) this unit.";
         };
       };

nixos/modules/system/etc/etc.nix

@@ -70,7 +70,7 @@ in
             };
 
             source = mkOption {
-              types = types.path;
+              type = types.path;
               description = "Path of the source file.";
             };