ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Fix NixOS evaluation. As I understand, configuration gets added to the list of modules as an attrSet (not as a file name). Just add a trivial check to passthrough such modules.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17116
This commit is contained in:
Michael Raskin 2009-09-14 20:10:41 +00:00
parent da09a4e950
commit b98b622ef0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/lib/modules.nix
View File

@ -64,8 +64,10 @@ rec {
moduleClosure = initModules: args:
let
moduleImport = m: lib.addErrorContext "Import module ${m}." (
(unifyModuleSyntax (applyIfFunction (import m) args)) // {
moduleImport = m: lib.addErrorContext
"Import module ${(if builtins.isAttrs m then "{...}" else m)}." (
(unifyModuleSyntax (applyIfFunction
(if builtins.isAttrs m then m else import m) args)) // {
# used by generic closure to avoid duplicated imports.
key = m;
paths = [ m ];
@ -88,4 +90,4 @@ rec {
[ m ]
) modules;
}
}