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
@@ -15,10 +15,10 @@ in
  options = {

    assertions = mkOption {
+      type = types.listOf types.unspecified;
      internal = true;
      default = [];
      example = [ { assertion = false; message = "you can't enable this for that reason"; } ];
-      merge = pkgs.lib.mergeListOption;
      description = ''
        This option allows modules to express conditions that must
        hold for the evaluation of the system configuration to