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

Update option-usages.nix expression to work with newer version of the module system.

Browse Source
This commit is contained in:
Nicolas B. Pierron
2015-08-09 17:52:34 +02:00
parent 2c9c135ee2
commit c47e89623b
3 changed files with 138 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/lib/eval-config.nix
+3 -1
View File
@@ -17,6 +17,8 @@
baseModules ? import ../modules/module-list.nix
, # !!! See comment about args in lib/modules.nix
extraArgs ? {}
, # !!! See comment about args in lib/modules.nix
specialArgs ? {}
, modules
, # !!! See comment about check in lib/modules.nix
check ? true
@@ -47,7 +49,7 @@ in rec {
inherit prefix check;
modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
args = extraArgs;
specialArgs = { modulesPath = ../modules; };
specialArgs = { modulesPath = ../modules; } // specialArgs;
}) config options;
# These are the extra arguments passed to every module. In