From c949e6022078188e2fbcf0d9306c4d9cf018876e Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Wed, 5 May 2021 18:42:52 -0700 Subject: [PATCH 1/2] lib/modules: pass specialArgs as a module argument --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index d515ee24d16..cc38e4cba87 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -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; From 87c659ab94b99d31dd5b121ca35a2855a8b85081 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Wed, 5 May 2021 18:43:24 -0700 Subject: [PATCH 2/2] nixos/top-level: specialArgs to specialisations --- nixos/modules/system/activation/top-level.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 9dbca4e33f3..6751ca3f2ee 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modules, baseModules, ... }: +{ config, lib, pkgs, modules, baseModules, specialArgs, ... }: with lib; @@ -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)