Merge pull request #260195 from hercules-ci/nixos-eval-config-renames

authored by Silvan Mosberger and committed by GitHub 98156cb8 920568ab

+4 -4
+4 -4
nixos/lib/eval-config.nix
··· 107 108 nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; 109 110 - withExtraArgs = nixosSystem: nixosSystem // { 111 inherit extraArgs; 112 - inherit (nixosSystem._module.args) pkgs; 113 - extendModules = args: withExtraArgs (nixosSystem.extendModules args); 114 }; 115 in 116 - withWarnings (withExtraArgs nixosWithUserModules)
··· 107 108 nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; 109 110 + withExtraAttrs = configuration: configuration // { 111 inherit extraArgs; 112 + inherit (configuration._module.args) pkgs; 113 + extendModules = args: withExtraAttrs (configuration.extendModules args); 114 }; 115 in 116 + withWarnings (withExtraAttrs nixosWithUserModules)