diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-16 18:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 18:00:57 +0000 |
| commit | feedc73bee3d3f83b85d36c91f4bd4ff16fcfe43 (patch) | |
| tree | dc2119ca420481a2e6072eea0f98a818de5be579 /lib | |
| parent | 736d06d6cfefaba0cf6e1c69b1b111d65d12dd4a (diff) | |
| parent | 4a04be9a3cb62d6e6f70d08b34a04b7890ba2084 (diff) | |
Merge master into staging-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/options.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index c77ce88cc4403..21e4bab2b942b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -146,7 +146,7 @@ let scrubOptionValue literalExpression literalExample showOption showOptionWithDefLocs showFiles unknownModule mkOption mkPackageOption mkPackageOptionMD - literalMD; + 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 a968bb77d4c9c..7e64e6e510fb9 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -404,7 +404,7 @@ rec { Kept here to alert downstream users who may not be aware of the migration's completion that it should be removed from modules. */ - mdDoc = lib.warn "lib.mdDoc was removed from nixpkgs. Option descriptions are now in Markdown by default, you can remove any remaining uses of it."; + mdDoc = lib.warn "lib.mdDoc will be removed from nixpkgs in 24.11. Option descriptions are now in Markdown by default; you can remove any remaining uses of lib.mdDoc."; /* For use in the `defaultText` and `example` option attributes. Causes the given MD text to be inserted verbatim in the documentation, for when |