Replace the traversal of modules:

- Remove handleOptionSets which used option declarations & definitions
in the same set.
- Add a traversal of modules where "config" and "options" are traverse at
the same time.

This allow to have accruate error messages with the incriminated files
playing a role in the error.

This system add a new restriction compare to the previous system:
- A module with no structure (option definitions & option declarations
& require) should not contain any option declarations.  If such module
exists you must convert it to the following form:

{ imports = <content of the require attribute>;
  options = <set of option declarations>;
  config = <set of option definitions>;
}

svn path=/nixpkgs/trunk/; revision=17163

1 files changed, 4 insertions, 2 deletions

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 60aecd5aa63..8fe29151976 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -200,14 +200,16 @@ rec {
   # Merge sets of attributes and use the function f to merge
   # attributes values.
   zip = f: sets:
+    zipWithNames (concatMap builtins.attrNames sets) f sets;
+
+  zipWithNames = names: f: sets:
     builtins.listToAttrs (map (name: {
       inherit name;
       value =
         f name
           (map (__getAttr name)
             (filter (__hasAttr name) sets));
-    }) (concatMap builtins.attrNames sets));
-
+    }) names);
 
   lazyGenericClosure = {startSet, operator}:
     let