Browse Source

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

svn path=/nixos/branches/modular-nixos/; revision=16194
nsd-state-dir
Nicolas Pierron 14 years ago
parent
commit
36bc4971ba
  1. 11
      lib/check-config.nix
  2. 13
      lib/eval-config.nix

11
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.
'';
};
}

13
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

Loading…
Cancel
Save