Add declarations and definitions to options. This allow you to retrieve

the location of the definition with the defined value.

Filter the source location for the documentation.

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

pkgs/lib/modules.nix

@@ -207,6 +207,19 @@ rec {
                 addOptionMakeUp
                   { name = addName name; recurseInto = recurseForOption; }
                   (mergeOptionDecls decls)
+                // {
+                  declarations =
+                    map (m: {
+                      source = m.key;
+                      value = m.options;
+                    }) (declarationsOf name);
+    
+                  definitions =
+                    map (m: {
+                      source = m.key;
+                      value = m.config;
+                    }) (definitionsOf name);
+                }
             else if all isAttrs values then
               (recurseInto name modules).options
             else

pkgs/lib/options.nix

@@ -240,6 +240,9 @@ rec {
             inherit (opt) name;
             description = if opt ? description then opt.description else
               throw "Option ${opt.name}: No description.";
+
+            declarations = map (x: toString x.source) opt.declarations;
+            definitions = map (x: toString x.source) opt.definitions;
           }
           // (if opt ? example then {inherit(opt) example;} else {})
           // (if opt ? default then {inherit(opt) default;} else {});