From f402fd73f24a926e12de57ca68f67ee0943648cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Oct 2007 13:27:45 +0000
Subject: [PATCH] * 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
---
 system/config.nix  | 1 +
 system/options.nix | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/system/config.nix b/system/config.nix
index 7092ef6813c7..dad42cbad0e0 100644
--- a/system/config.nix
+++ b/system/config.nix
@@ -20,6 +20,7 @@ rec {
       decl =
         lib.findSingle (decl: lib.eqLists decl.name name)
           (abort ("Undeclared option `" + printName name + "'."))
+          (abort ("Multiple declarations for option `" + printName name + "'."))
           declarations;
       default =
         if !decl ? default
diff --git a/system/options.nix b/system/options.nix
index 2ec872db51c8..2ee61a00de0b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -720,14 +720,6 @@
 	";
   }  
 
-  {
-	name = ["services" "xserver" "layout"];
-	default = "us";
-	description ="
-	Keyboard layout.
-	";
-  }  
-
   {
 	name = ["services" "xserver" "useInternalAGPGART"];
 	default = "";