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

Update the function used to merge option sets.

Browse Source 
svn path=/nixos/branches/fix-style/; revision=13853
This commit is contained in:
Nicolas Pierron 2009-01-25 15:48:43 +00:00
parent 67edd3720f
commit 9fa758c657
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/system.nix
View File

@ -11,14 +11,11 @@ rec {
systemPathList systemPathList
]; ];
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 = config =
pkgs.lib.fixOptionSets pkgs.lib.fixOptionSets
(pkgs.lib.mergeOptionSets noOption) pkgs.lib.newMergeOptionSets
pkgs configComponents; pkgs configComponents;
optionDeclarations = optionDeclarations =