summary refs log tree commit diff
path: root/nixos/lib/eval-config.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/lib/eval-config.nix')
-rw-r--r--nixos/lib/eval-config.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 79890e0add7..a87b285c5b7 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;