Unverified Commit 98156cb8 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

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

parents 920568ab a14f3f82

nixos/lib/eval-config.nix

+4 −4
Original line number Diff line number Diff line
@@ -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)