swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/lib/eval-config.nix
View file

@ -107,10 +107,10 @@ let
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
withExtraArgs = nixosSystem: nixosSystem // { withExtraAttrs = configuration: configuration // {
inherit extraArgs; inherit extraArgs;
inherit (nixosSystem._module.args) pkgs; inherit (configuration._module.args) pkgs;
extendModules = args: withExtraArgs (nixosSystem.extendModules args); extendModules = args: withExtraAttrs (configuration.extendModules args);
}; };
in in
withWarnings (withExtraArgs nixosWithUserModules) withWarnings (withExtraAttrs nixosWithUserModules)