Merge pull request #97042 from Infinisil/freeform-option-docs

Show sub options of freeform types
2020-09-07 19:31:01 +02:00
parent 3c4335723c f320dbae41
commit f73b762aac
2 changed files with 32 additions and 1 deletions
@@ -427,7 +427,12 @@ rec {
            # would be used, and use of `<` and `>` would break the XML document.
            # It shouldn't cause an issue since this is cosmetic for the manual.
            args.name = "‹name›";
-          }).options;
+          }).options // optionalAttrs (freeformType != null) {
+            # Expose the sub options of the freeform type. Note that the option
+            # discovery doesn't care about the attribute name used here, so this
+            # is just to avoid conflicts with potential options from the submodule
+            _freeformOptions = freeformType.getSubOptions prefix;
+          };
        getSubModules = modules;
        substSubModules = m: submoduleWith (attrs // {
          modules = m;