Skip to content

lib/modules: pass specialArgs to modules #121870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 2 commits into from
May 6, 2021
Merged

lib/modules: pass specialArgs to modules #121870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c949e60
lib/modules: pass specialArgs as a module argument
May 6, 2021
87c659a
nixos/top-level: specialArgs to specialisations
May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/modules.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ rec {
let collected = collectModules
(specialArgs.modulesPath or "")
(modules ++ [ internalModule ])
({ inherit lib options config; } // specialArgs);
({ inherit lib options config specialArgs; } // specialArgs);
in mergeModules prefix (reverseList collected);

options = merged.matchedOptions;
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/system/activation/top-level.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, pkgs, modules, baseModules, ... }:
{ config, lib, pkgs, modules, baseModules, specialArgs, ... }:

with lib;

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