Check for undeclared options

2013-10-28 22:45:56 +01:00
parent c263b5b284
commit f4a418761b
4 changed files with 35 additions and 26 deletions
@@ -182,11 +182,11 @@ rec {
          let
            coerce = def: if builtins.isFunction def then def else { config = def; };
            modules = opts' ++ map coerce defs;
-          in (evalModules' args.prefix modules args).config;
-        getSubOptions = prefix: (evalModules' prefix opts'
-          # FIXME: hack to get shit to evaluate.
-          { name = ""; }
-        ).options;
+          in (evalModules { inherit modules args; prefix = args.prefix; }).config;
+        getSubOptions = prefix: (evalModules
+          { modules = opts'; inherit prefix;
+            # FIXME: hack to get shit to evaluate.
+            args = { name = ""; }; }).options;
      };

    # Obsolete alternative to configOf.  It takes its option