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

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

Browse Source
This commit is contained in:
Silvan Mosberger
2023-10-10 13:33:53 +02:00
committed by GitHub
parent 920568abf7 a14f3f829d
commit 98156cb838
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/lib/eval-config.nix
+4 -4
View File
@@ -107,10 +107,10 @@ let
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
withExtraArgs = nixosSystem: nixosSystem // {
withExtraAttrs = configuration: configuration // {
inherit extraArgs;
inherit (nixosSystem._module.args) pkgs;
extendModules = args: withExtraArgs (nixosSystem.extendModules args);
inherit (configuration._module.args) pkgs;
extendModules = args: withExtraAttrs (configuration.extendModules args);
};
in
withWarnings (withExtraArgs nixosWithUserModules)
withWarnings (withExtraAttrs nixosWithUserModules)