Added checking of unkonwn options in configuration.nix and a system-wide font set changer.

svn path=/nixos/trunk/; revision=9370

etc/default.nix

@@ -120,7 +120,7 @@ import ../helpers/make-etc.nix {
   ++ (optional ["fonts" "enableFontConfig"] { 
     source = pkgs.runCommand "fonts.conf"
       { 
-        fontDirectories = import ../system/fonts.nix {inherit pkgs;};
+        fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
         buildInputs = [pkgs.libxslt];
         inherit (pkgs) fontconfig;
       }

system/fonts.nix

@@ -1,4 +1,4 @@
-{pkgs}:
+{pkgs , config}:
 
 [
   # - the user's .fonts directory
@@ -18,4 +18,6 @@
   pkgs.xorg.fontbh100dpi
   pkgs.xorg.fontmiscmisc
   pkgs.xorg.fontcursormisc
-]
+] ++
+((config.get ["fonts" "extraFonts"]) pkgs)
+

system/options.nix

@@ -1118,6 +1118,15 @@ root        ALL=(ALL) SETENV: ALL
     ";
   }
 
+  {
+    name = ["fonts" "extraFonts"];
+    default = pkgs:[];
+    description = "
+	Function, returning list of additional fonts.
+    ";
+  }
+
+ 
   
   {
     name = ["sound" "enable"];

system/system.nix

@@ -309,7 +309,7 @@ rec {
   # kernel, the Upstart services, the init scripts, etc.) as well as a
   # script `switch-to-configuration' that activates the configuration
   # and makes it bootable.
-  system = pkgs.stdenv.mkDerivation {
+  system = pkgs.checker (pkgs.stdenv.mkDerivation {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
@@ -335,7 +335,6 @@ rec {
       pkgs.upstart # for initctl
     ];
     configurationName = config.get ["boot" "configurationName"];
-  };
-
-
+  }) (pkgs.getConfig ["checkConfigurationOptions"] false) 
+	config.declarations configuration ;
 }

upstart-jobs/default.nix

@@ -161,7 +161,7 @@ import ../upstart-jobs/gather.nix {
         openssh x11_ssh_askpass nvidiaDrivers synaptics;
       libX11 = pkgs.xlibs.libX11;
       libXext = pkgs.xlibs.libXext;
-      fontDirectories = import ../system/fonts.nix {inherit pkgs;};
+      fontDirectories = import ../system/fonts.nix {inherit pkgs config;};
 	isClone = config.get ["services" "xserver" "isClone"];
     })