From 36bc4971bab35ba9724674a5e9b248e82a8e5414 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 6 Jul 2009 16:21:03 +0000
Subject: [PATCH] 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 | 11 +++++++++++
 lib/eval-config.nix  | 13 ++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 lib/check-config.nix

diff --git a/lib/check-config.nix b/lib/check-config.nix
new file mode 100644
index 00000000000..e2cd2c06d6a
--- /dev/null
+++ b/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.
+    '';
+  };
+}
\ No newline at end of file
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 991f86b2664..84c60bd6921 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -13,17 +13,8 @@ rec {
 
   configComponents = [
     configuration
-    {
-      require = import ../modules/module-list.nix;
-      environment.checkConfigurationOptions = pkgs.lib.mkOption {
-        default = true;
-        example = false;
-        description = ''
-          Whether to check the validity of the entire configuration.
-        '';
-      };
-    }
-  ];
+    ./check-config.nix
+  ] ++ (import ../modules/module-list.nix);
 
   config_ =
     pkgs.lib.fixOptionSets