From 4c1cfbdb844babe1054c7f365eac337396092d60 Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 30 Dec 2022 20:43:53 +0100 Subject: modules: add mkAliasOptionModuleMD mkAliasOptionModule should not default to mdDoc descriptions because that can break out-of-tree users of documentation infrastructure. add an explicitly-MD variant for now, to be removed some time after the MD transition is complete. --- lib/modules.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/modules.nix') diff --git a/lib/modules.nix b/lib/modules.nix index caabfee5710..166c24a3a05 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1108,6 +1108,15 @@ rec { visible = true; warn = false; use = id; + wrapDescription = lib.id; + }; + + /* Transitional version of mkAliasOptionModule that uses MD docs. */ + mkAliasOptionModuleMD = from: to: doRename { + inherit from to; + visible = true; + warn = false; + use = id; }; /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b @@ -1130,7 +1139,7 @@ rec { (opt.highestPrio or defaultOverridePriority) (f opt.value); - doRename = { from, to, visible, warn, use, withPriority ? true }: + doRename = { from, to, visible, warn, use, withPriority ? true, wrapDescription ? lib.mdDoc }: { config, options, ... }: let fromOpt = getAttrFromPath from options; @@ -1141,7 +1150,7 @@ rec { { options = setAttrByPath from (mkOption { inherit visible; - description = lib.mdDoc "Alias of {option}`${showOption to}`."; + description = wrapDescription "Alias of {option}`${showOption to}`."; apply = x: use (toOf config); } // optionalAttrs (toType != null) { type = toType; -- cgit 1.4.1