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

* Print a sensible error message if there are multiple declarations 

for an option.
* Removed double declaration for services.xserver.layout.

svn path=/nixos/trunk/; revision=9398
This commit is contained in:
Eelco Dolstra 2007-10-03 13:27:45 +00:00
parent 33aa5d2d74
commit f402fd73f2
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
system/config.nix
View File

@ -20,6 +20,7 @@ rec {
decl = decl =
lib.findSingle (decl: lib.eqLists decl.name name) lib.findSingle (decl: lib.eqLists decl.name name)
(abort ("Undeclared option `" + printName name + "'.")) (abort ("Undeclared option `" + printName name + "'."))
(abort ("Multiple declarations for option `" + printName name + "'."))
declarations; declarations;
default = default =
if !decl ? default if !decl ? default

8
system/options.nix
View File

@ -720,14 +720,6 @@
"; ";
} }
{
name = ["services" "xserver" "layout"];
default = "us";
description ="
Keyboard layout.
";
}
{ {
name = ["services" "xserver" "useInternalAGPGART"]; name = ["services" "xserver" "useInternalAGPGART"];
default = ""; default = "";