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
@@ -68,12 +68,12 @@ in
    services.dbus = {

      enable = mkOption {
+        type = types.bool;
        default = true;
        description = ''
          Whether to start the D-Bus message bus daemon, which is
          required by many other system services and applications.
        '';
-        merge = pkgs.lib.mergeEnableOption;
      };

      packages = mkOption {