summary refs log tree commit diff
path: root/pkgs/lib/modules.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2013-06-06 13:59:26 -0400
committerShea Levy <shea@shealevy.com>2013-06-06 14:00:10 -0400
commitd465d6764ab6e11bdd01b2f8bf8bd5cb436e6870 (patch)
tree6c429624f1e176d820ce434fbe9dfa6498c4ffce /pkgs/lib/modules.nix
parentbc409a6e00c5ac691d5e632402fd06bb70a8f24a (diff)
downloadnixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar.gz
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar.bz2
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar.lz
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar.xz
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.tar.zst
nixpkgs-d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870.zip
Allow imports in submodules
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/lib/modules.nix')
-rw-r--r--pkgs/lib/modules.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 286178a0fa7..74603e9c579 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -197,9 +197,9 @@ rec {
       recurseInto = name:
         moduleMerge (addName name) (modulesOf name);
 
-      recurseForOption = name: modules:
+      recurseForOption = name: modules: args:
         moduleMerge name (
-          map unifyModuleSyntax modules
+          moduleClosure modules args
         );
 
       errorSource = modules: