From d69cc82771d47f330891b35f6b9df25a22df7d1a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 15 Jan 2008 16:05:51 +0000 Subject: [PATCH] Moved configuration check option into configuration.nix (environment.checkConfigurationOptions) svn path=/nixos/trunk/; revision=10157 --- system/options.nix | 7 +++++++ system/system.nix | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/system/options.nix b/system/options.nix index bf571d56635..ab39d15857c 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1872,6 +1872,13 @@ root ALL=(ALL) SETENV: ALL "; }; + checkConfigurationOptions = mkOption { + default = false; + example = true; + description = " + If all configuration options must be checked. Non-existing options fail build. + "; + }; }; nesting = { diff --git a/system/system.nix b/system/system.nix index 21e8c06a8be..8978473c872 100644 --- a/system/system.nix +++ b/system/system.nix @@ -369,6 +369,8 @@ rec { configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) config.nesting.children; configurationName = config.boot.configurationName; - }) (pkgs.getConfig ["checkConfigurationOptions"] false) - optionDeclarations configuration ; + }) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] + optionDeclarations.environment.checkConfigurationOptions.default + configuration) + optionDeclarations configuration ; }