mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 23:52:55 +00:00
Merge pull request #260195 from hercules-ci/nixos-eval-config-renames
This commit is contained in:
commit
98156cb838
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user