Revert "lib/modules: Throw better error when definitions assign to an option set"

This reverts commit 15c873b486. This was causing infinite recursion when depending on nested options
2020-03-19 03:50:15 +01:00
parent d0cf54223c
commit 9eecf2d057
3 changed files with 1 additions and 9 deletions
@@ -299,9 +299,7 @@ rec {
            in
              throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
          else
-            if all (def: isAttrs def.value) defns' then mergeModules' loc decls defns
-            else let firstInvalid = findFirst (def: ! isAttrs def.value) null defns';
-            in throw "The option path `${showOption loc}' is an attribute set of options, but it is defined to not be an attribute set in `${firstInvalid.file}'. Did you define its value at the correct and complete path?"
+            mergeModules' loc decls defns
      ))
    // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };