Fix bogus mkOption types

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

2 files changed, 8 insertions, 8 deletions

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index dc4261bdb097..936733514382 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/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;
       };
     };
 
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 3c27c1400f93..e6a2437902c6 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/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;
     };
   };