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
@@ -40,10 +40,10 @@ in
      };

      default = mkOption {
+        type = types.uniq types.string;
        default = "none";
        example = "wmii";
        description = "Default window manager loaded if none have been chosen.";
-        merge = mergeOneOption;
        apply = defaultWM:
          if any (w: w.name == defaultWM) cfg.session then
            defaultWM