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

svn path=/nixos/branches/modular-nixos/; revision=16194
This commit is contained in:
Nicolas Pierron 2009-07-06 16:21:03 +00:00
parent 26fcc601a6
commit 36bc4971ba
2 changed files with 13 additions and 11 deletions

11
lib/check-config.nix Normal file
View File

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

View File

@ -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