diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-01 20:47:08 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-01 20:52:06 +0100 |
commit | f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3 (patch) | |
tree | 2501bf5c09108c836925aefc4674ebec0b508193 /nixos/lib/eval-config.nix | |
parent | bf4cafd1ddbd7c396a9df6a5d0fb02f2b7d21896 (diff) | |
download | nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar.gz nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar.bz2 nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar.lz nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar.xz nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.tar.zst nixlib-f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3.zip |
Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
This reverts commit cad8957eabcbf73062226d28366fd446c15c8737. It breaks NixOps, but more importantly, such major changes to the module system really need to be reviewed.
Diffstat (limited to 'nixos/lib/eval-config.nix')
-rw-r--r-- | nixos/lib/eval-config.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 79890e0add7d..a87b285c5b7b 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -20,13 +20,8 @@ , # !!! See comment about args in lib/modules.nix specialArgs ? {} , modules -, # Pass through a configuration of the internal modules declared - # in lib/modules.nix. - _module ? {} -, # !!! See comment about typeInference in lib/modules.nix - typeInference ? null , # !!! See comment about check in lib/modules.nix - check ? null + check ? true , prefix ? [] , lib ? import ../../lib }: @@ -46,17 +41,13 @@ let }; }; - internalModule = { _module = (_module - // (if isNull check then {} else { inherit check; }) - // (if isNull typeInference then {} else { inherit typeInference; })); }; - in rec { # Merge the option definitions in all modules, forming the full # system configuration. inherit (lib.evalModules { - inherit prefix; - modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ] ++ [ internalModule ]; + inherit prefix check; + modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; specialArgs = { modulesPath = ../modules; } // specialArgs; }) config options; |