Remove uses of the "merge" option attribute

It's redundant because you can (and should) specify an option type, or an apply function.
2013-10-28 22:45:56 +01:00
parent f4a418761b
commit d5047faede
20 changed files with 36 additions and 27 deletions
@@ -99,7 +99,7 @@ in
          mkHash functions, which take a string representation of a float and an
          attrset, respectively.
        '';
-        merge = mergeConfigs;
+        apply = mergeConfigs;
      };

      filterConfig = mkOption {
@@ -109,7 +109,7 @@ in
          representing a logstash configuration's filter section.
          See inputConfig description for details.
        '';
-        merge = mergeConfigs;
+        apply = mergeConfigs;
      };

      outputConfig = mkOption {
@@ -119,7 +119,7 @@ in
          representing a logstash configuration's output section.
          See inputConfig description for details.
        '';
-        merge = mergeConfigs;
+        apply = mergeConfigs;
      };
    };
  };