diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 14:07:47 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 14:07:47 +0100 |
commit | 9fd9c617a9c84293b67b2a43ca752b30565f2b88 (patch) | |
tree | 7fb7135f53c30dadc6064a21154bde03f1bd8142 /nixos/lib | |
parent | 537db62345147565ae592d2b6641a662e07a152a (diff) | |
download | nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar.gz nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar.bz2 nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar.lz nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar.xz nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.tar.zst nixlib-9fd9c617a9c84293b67b2a43ca752b30565f2b88.zip |
nixos/lib/eval-config.nix: Return all of evalModules return attrs
We were exposing everything pointwise anyway. If any new attrs are added, there's a good chance we'll want to expose them anyway.
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/eval-config.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 89fb93ba70ad..00e58e24e926 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -88,13 +88,8 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; -in withWarnings { - - # Merge the option definitions in all modules, forming the full - # system configuration. - inherit (nixosWithUserModules) config options _module type extendModules; - +in +withWarnings nixosWithUserModules // { inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; } |