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

Merge pull request #121870 from Pacman99/pass-specialargs 

lib/modules: pass specialArgs to modules
This commit is contained in:
Robert Hensing 2021-05-07 01:54:48 +02:00 committed by GitHub
parent 86878f63f9 87c659ab94
commit 0633b6aa74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/modules.nix
View File

@ -128,7 +128,7 @@ rec {
let collected = collectModules let collected = collectModules
(specialArgs.modulesPath or "") (specialArgs.modulesPath or "")
(modules ++ [ internalModule ]) (modules ++ [ internalModule ])
({ inherit lib options config; } // specialArgs); ({ inherit lib options config specialArgs; } // specialArgs);
in mergeModules prefix (reverseList collected); in mergeModules prefix (reverseList collected);
options = merged.matchedOptions; options = merged.matchedOptions;

4
nixos/modules/system/activation/top-level.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, modules, baseModules, ... }: { config, lib, pkgs, modules, baseModules, specialArgs, ... }:
with lib; with lib;
@ -13,7 +13,7 @@ let
# !!! fix this # !!! fix this
children = mapAttrs (childName: childConfig: children = mapAttrs (childName: childConfig:
(import ../../../lib/eval-config.nix { (import ../../../lib/eval-config.nix {
inherit baseModules; inherit baseModules specialArgs;
system = config.nixpkgs.initialSystem; system = config.nixpkgs.initialSystem;
modules = modules =
(optionals childConfig.inheritParentConfig modules) (optionals childConfig.inheritParentConfig modules)