diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/modules.nix | 1 | ||||
| -rwxr-xr-x | lib/tests/modules.sh | 1 | ||||
| -rw-r--r-- | lib/tests/modules/import-configuration.nix | 12 |
3 files changed, 14 insertions, 0 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 8233b4b9e84..3bcd8d280b7 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -347,6 +347,7 @@ let }; result = withWarnings { + _type = "configuration"; options = checked options; config = checked (removeAttrs config [ "_module" ]); _module = checked (config._module); diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 4da0cb38f68..d12e503c4b1 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -368,6 +368,7 @@ checkConfigError 'The module foo.nix#darwinModules.default was imported into nix # _type check checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix checkConfigOutput '^true$' "$@" config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix +checkConfigError 'Could not load a value as a module, because it is of type "configuration", in file .*/import-configuration.nix' config ./import-configuration.nix # doRename works when `warnings` does not exist. checkConfigOutput '^1234$' config.c.d.e ./doRename-basic.nix diff --git a/lib/tests/modules/import-configuration.nix b/lib/tests/modules/import-configuration.nix new file mode 100644 index 00000000000..a2a32bbee4c --- /dev/null +++ b/lib/tests/modules/import-configuration.nix @@ -0,0 +1,12 @@ +{ lib, ... }: +let + myconf = lib.evalModules { modules = [ { } ]; }; +in +{ + imports = [ + # We can't do this. A configuration is not equal to its set of a modules. + # Equating those would lead to a mess, as specialArgs, anonymous modules + # that can't be deduplicated, and possibly more come into play. + myconf + ]; +} |