* Change the check function to accept sub-modules with arguments in

option definitions.

svn path=/nixpkgs/trunk/; revision=18252

pkgs/lib/types.nix

@@ -135,7 +135,7 @@ rec {
       name = "option set";
       # merge is done in "options.nix > addOptionMakeUp > handleOptionSets"
       merge = lib.id;
-      check = x: lib.traceValIfNot builtins.isAttrs x;
+      check = x: isAttrs x || builtins.isFunction x;
       hasOptions = true;
       delayOnGlobalEval = true;
     };