JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow imports in plain modules

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-28 17:40:36 +01:00
parent 1e24ce2a9b
commit 1367074940
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/modules.nix
View File

@ -36,7 +36,7 @@ rec {
/* Massage a module into canonical form, that is, a set consisting
of ‘options’, ‘config’ and ‘imports’ attributes. */
unifyModuleSyntax = file: key: m:
if m ? config || m ? options || m ? imports then
if m ? config || m ? options then
let badAttrs = removeAttrs m ["imports" "options" "config" "key"]; in
if badAttrs != {} then
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'."
@ -50,9 +50,9 @@ rec {
else
{ inherit file;
key = m.key or key;
imports = m.require or [];
imports = m.require or [] ++ m.imports or [];
options = {};
config = removeAttrs m ["key" "require"];
config = removeAttrs m ["key" "require" "imports"];
};
applyIfFunction = f: arg: if builtins.isFunction f then f arg else f;