diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2022-06-21 13:16:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 13:16:02 +0200 |
commit | e2c261f2c00464ef7cbb4d7ee7d274215160cd9c (patch) | |
tree | 90226cbe2c9a235e10be717433ee0891dbfd05ce /lib | |
parent | a72d7811be1162dd6804c4e36e5402d76fb6e921 (diff) | |
parent | 320aa2a7910a71371204d672ff612cc9af5337da (diff) |
Merge pull request #176146 from pennae/module-docs-markdown
treewide: markdown option docs
Diffstat (limited to 'lib')
-rw-r--r-- | lib/default.nix | 3 | ||||
-rw-r--r-- | lib/options.nix | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix index a0d3339ef08e8..070c2a67cf073 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -131,7 +131,8 @@ let getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption mkPackageOption; + showOption showFiles unknownModule mkOption mkPackageOption + mdDoc literalMD; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/lib/options.nix b/lib/options.nix index 8d82a809083b7..50b19e4837360 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -280,6 +280,21 @@ rec { if ! isString text then throw "literalDocBook expects a string." else { _type = "literalDocBook"; inherit text; }; + /* Transition marker for documentation that's already migrated to markdown + syntax. + */ + mdDoc = text: + if ! isString text then throw "mdDoc expects a string." + else { _type = "mdDoc"; inherit text; }; + + /* For use in the `defaultText` and `example` option attributes. Causes the + given MD text to be inserted verbatim in the documentation, for when + a `literalExpression` would be too hard to read. + */ + literalMD = text: + if ! isString text then throw "literalMD expects a string." + else { _type = "literalMD"; inherit text; }; + # Helper functions. /* Convert an option, described as a list of the option parts in to a |