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

This reverts commit 15c873b486347e7861c64fb0b5a7852be9fc82e4.

This was causing infinite recursion when depending on nested options

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/modules.nix b/lib/modules.nix
index 518f4047cc60d..c18fec66c7056 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -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; };