Browse Source

* More cleanup.

svn path=/nixos/branches/modular-nixos/; revision=15773
nsd-state-dir
Eelco Dolstra 14 years ago
parent
commit
107fc990a6
  1. 11
      lib/eval-config.nix
  2. 2
      modules/legacy.nix
  3. 0
      modules/misc/assertions.nix
  4. 1
      modules/module-list.nix
  5. 15
      system/nixos-environment.nix

11
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 =

2
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

0
system/assertion.nix → modules/misc/assertions.nix

1
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

15
system/nixos-environment.nix

@ -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.
";
};
};
}
Loading…
Cancel
Save