diff options
author | Silvan Mosberger <contact@infinisil.com> | 2020-11-30 21:00:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-30 21:00:59 +0100 |
commit | e08182020c93ede9e014b3177cd35e5c4b9dc65b (patch) | |
tree | 32edbef05b1904f02ecfecc3be7c8a19b3f4e731 /lib/modules.nix | |
parent | 881dee52844051f792040ef43d578547c71f36ed (diff) | |
parent | 769eac074045b86fd4a6e4b492959bb514befd3d (diff) |
Merge pull request #99115 from Infinisil/toString-module-files
lib/modules: Make sure to not import module _file's into the store
Diffstat (limited to 'lib/modules.nix')
-rw-r--r-- | lib/modules.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index d2d35dbaae513..3f2bfd478b0df 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -265,7 +265,7 @@ rec { if badAttrs != {} then throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute." else - { _file = m._file or file; + { _file = toString m._file or file; key = toString m.key or key; disabledModules = m.disabledModules or []; imports = m.imports or []; @@ -273,7 +273,7 @@ rec { config = addFreeformType (addMeta (m.config or {})); } else - { _file = m._file or file; + { _file = toString m._file or file; key = toString m.key or key; disabledModules = m.disabledModules or []; imports = m.require or [] ++ m.imports or []; |