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, 1 insertions, 1 deletions

diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index aec2fb0bcc06..2f916d3ddd73 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -23,4 +23,4 @@ in
   # !!! don't include everything at top-level; perhaps only the most
   # commonly used functions.
   // trivial // lists // strings // stringsWithDeps // attrsets // sources
-  // properties // options // types // meta // debug // misc
+  // properties // options // types // meta // debug // misc // modules