public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new scheme of configuration evaluation.

Browse Source 
svn path=/nixos/trunk/; revision=12519
This commit is contained in:
Nicolas Pierron 2008-08-06 17:39:05 +00:00
parent f5e61dfa0c
commit 92560a1dc0
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/system.nix
View File

@ -5,13 +5,23 @@
}: }:
rec { rec {
configComponents = [
configuration
optionDeclarations
];
noOption = name: values:
abort "${name}: Used without option declaration.";
# Make a configuration object from which we can retrieve option # Make a configuration object from which we can retrieve option
# values. # values.
config = pkgs.lib.addDefaultOptionValues optionDeclarations configuration; config =
pkgs.lib.finalReferenceOptionSets
(pkgs.lib.mergeOptionSets noOption)
pkgs configComponents;
optionDeclarations = import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;}; optionDeclarations =
import ./options.nix {inherit pkgs; inherit (pkgs.lib) mkOption;};
pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;}; pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {system = platform;};
@ -438,8 +448,6 @@ rec {
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
config.nesting.children; config.nesting.children;
configurationName = config.boot.configurationName; configurationName = config.boot.configurationName;
}) (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] }) config.environment.checkConfigurationOptions
optionDeclarations.environment.checkConfigurationOptions.default optionDeclarations config;
configuration)
optionDeclarations configuration;
} }