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

1 files changed, 13 insertions, 0 deletions

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 10667dc3ade..d9b9d3b54c1 100644
--- a/pkgs/lib/modules.nix
+++ b/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