* Report file locations in the stack-trace when multiple option

declarations cannot be merged.

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

pkgs/lib/modules.nix

@@ -217,9 +217,14 @@ rec {
             ) declarations;
 
           decl =
-            addOptionMakeUp
+            lib.addErrorContext "${eol
-              { name = addName name; recurseInto = recurseForOption; }
+              }while enhancing option '${addName name}'.${eol
-              (mergeOptionDecls decls);
+              }${errorSource declarations}${eol
+            }" (
+              addOptionMakeUp
+                { name = addName name; recurseInto = recurseForOption; }
+                (mergeOptionDecls decls)
+            );
 
           value = decl // (with config; {
             inherit (config) isNotDefined;