-
-
Notifications
You must be signed in to change notification settings - Fork 14k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
doc: markdown transition fixes #208407
doc: markdown transition fixes #208407
Conversation
A possible alternative to adding more
Independently from this PR, we probably want to make |
had thought about that, but that would somewhat violate the current invariant that mdDoc wraps only text. it'd be okay here because it's immediately unwrapped again, but we'd rather avoid that inconsistency. (mkEnableOption uses this approach instead of an *MD variant because there mdDoc does wrap only text)
certainly, but we'd still want a more elaborate name for the new specialArg just to be extra safe there's no collisions with users. |
I think we should try to keep it simple for two reasons
Also simple is good. |
We should probably mention |
added mentions of those functions. whitespace separating the examples is not missing, we purposely omitted it and grouped the last three examples together to have the error message still fit within nix's "last 10 log lines" excerpt. |
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.
another transitional option factory, like mkAliasOptionModuleMD.
unfortunately we can't unconditionally make this text markdown without impacting downstream users of docs generation (as noted in #175586). hide it entirely until the transition is complete.
and rebased to master to fix a module that has appeared since too 😓 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Half-hearted approval because the transitional period is taking way too long :/
well, we're going to be at it for another two years or so either way at the current speed ... |
Backport failed for Please cherry-pick the changes locally. git fetch origin release-22.11
git worktree add -d .worktree/backport-208407-to-release-22.11 origin/release-22.11
cd .worktree/backport-208407-to-release-22.11
git checkout -b backport-208407-to-release-22.11
ancref=$(git merge-base c735db25e8fc3c4bb54d17db15d7049a3c593062 3c575a659f10a8564a1c4a661570ee933e31ea2e)
git cherry-pick -x $ancref..3c575a659f10a8564a1c4a661570ee933e31ea2e |
https://github.com/NixOS/nixpkgs/actions/runs/3843384881/jobs/6545596726 Manual checks are failing since this was merged. |
Follow-up to NixOS#208407 Removing `mdDoc` isn't enough, we need to emit actual DocBook.
Follow-up to NixOS/nixpkgs#208407 Removing `mdDoc` isn't enough, we need to emit actual DocBook.
Follow-up to NixOS/nixpkgs#208407 Removing `mdDoc` isn't enough, we need to emit actual DocBook.
Follow-up to NixOS#208407 Removing `mdDoc` isn't enough, we need to emit actual DocBook.
Follow-up to NixOS/nixpkgs#208407 Removing `mdDoc` isn't enough, we need to emit actual DocBook.
Description of changes
#175586 (comment) reported problem for downstream users of the docs infra. changes to the option factories shouldn't be controversial, but the change to
_module.args
is different. not sure whether this is a good way to solve the problem, very much open to other ideas.should probably be backported to 22.11 in the end
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes