Update the function used to merge option sets.

svn path=/nixos/branches/fix-style/; revision=13853
2009-01-25 15:48:43 +00:00 · 2009-01-25 15:48:43 +00:00 · 9fa758c657
commit 9fa758c657
parent 67edd3720f
1 changed files with 1 additions and 4 deletions
--- a/system/system.nix
+++ b/system/system.nix
@ -11,14 +11,11 @@ rec {
    systemPathList
  ];

-  noOption = name: values:
-    abort "${name}: Used without option declaration.";
-
  # Make a configuration object from which we can retrieve option
  # values.
  config =
    pkgs.lib.fixOptionSets
-      (pkgs.lib.mergeOptionSets noOption)
+      pkgs.lib.newMergeOptionSets
      pkgs configComponents;

  optionDeclarations =