From 107fc990a6c868d33f7ead4caf6b39918588526c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 May 2009 16:20:08 +0000
Subject: [PATCH] * More cleanup.

svn path=/nixos/branches/modular-nixos/; revision=15773
---
 lib/eval-config.nix                               | 11 ++++++++++-
 modules/legacy.nix                                |  2 --
 .../assertion.nix => modules/misc/assertions.nix  |  0
 modules/module-list.nix                           |  1 +
 system/nixos-environment.nix                      | 15 ---------------
 5 files changed, 11 insertions(+), 18 deletions(-)
 rename system/assertion.nix => modules/misc/assertions.nix (100%)
 delete mode 100644 system/nixos-environment.nix

diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 6af1f2af81a..87211875456 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -7,7 +7,16 @@
 rec {
   configComponents = [
     configuration
-    { require = import ../modules/module-list.nix; }
+    {
+      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.
+        '';
+      };
+    }
   ];
 
   config =
diff --git a/modules/legacy.nix b/modules/legacy.nix
index c1f8a45d441..e20caaf1116 100644
--- a/modules/legacy.nix
+++ b/modules/legacy.nix
@@ -1,7 +1,5 @@
 {
   require = [
-    ../system/assertion.nix
-    ../system/nixos-environment.nix
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/ldap
diff --git a/system/assertion.nix b/modules/misc/assertions.nix
similarity index 100%
rename from system/assertion.nix
rename to modules/misc/assertions.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 05a81c76fa2..996ec24b62f 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -10,6 +10,7 @@
   ./config/users-groups.nix
   ./installer/grub/grub.nix
   ./legacy.nix
+  ./misc/assertions.nix
   ./programs/bash/bash.nix
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix
diff --git a/system/nixos-environment.nix b/system/nixos-environment.nix
deleted file mode 100644
index d07d401d8e5..00000000000
--- a/system/nixos-environment.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-{
-  environment = {
-    checkConfigurationOptions = mkOption {
-      default = true;
-      example = false;
-      description = "
-        If all configuration options must be checked. Non-existing options fail build.
-      ";
-    };
-  };
-}