diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-01-14 18:49:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 18:49:27 +0100 |
| commit | 2bf5958169ab5ac8871d3f3b9b1d6114de5376f2 (patch) | |
| tree | c304e49e167ca83e9b496b17481f13ed57ecae65 /nixos/lib | |
| parent | 632ca37b278832e605a7b4721d84a2ad63749f82 (diff) | |
| parent | a2710255c988de1f8ab17edea20f13f8b6c70efe (diff) | |
| download | nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar.gz nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar.bz2 nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar.lz nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar.xz nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.tar.zst nixlib-2bf5958169ab5ac8871d3f3b9b1d6114de5376f2.zip | |
Merge pull request #151082 from hercules-ci/nixos-cleanup-vmWithBootLoader
nixos: turn vmWithBootLoader into option (`nixos-rebuild build-vm`)
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 62d09b8173bd..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; - +in +withWarnings nixosWithUserModules // { inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; } |