Inline the require attribute and move the set into lib/check-config.nix.

svn path=/nixos/branches/modular-nixos/; revision=16194

lib/check-config.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}:
+
+{
+  environment.checkConfigurationOptions = pkgs.lib.mkOption {
+    default = true;
+    example = false;
+    description = ''
+      Whether to check the validity of the entire configuration.
+    '';
+  };
+}

lib/eval-config.nix

@@ -13,17 +13,8 @@ rec {
 
   configComponents = [
     configuration
-    {
+    ./check-config.nix
-      require = import ../modules/module-list.nix;
+  ] ++ (import ../modules/module-list.nix);
-      environment.checkConfigurationOptions = pkgs.lib.mkOption {
-        default = true;
-        example = false;
-        description = ''
-          Whether to check the validity of the entire configuration.
-        '';
-      };
-    }
-  ];
 
   config_ =
     pkgs.lib.fixOptionSets