make-options-doc: Support Nix-provided declaration links#174460
Merged
roberth merged 2 commits intoNixOS:masterfrom Jun 22, 2022
Merged
make-options-doc: Support Nix-provided declaration links#174460roberth merged 2 commits intoNixOS:masterfrom
roberth merged 2 commits intoNixOS:masterfrom
Conversation
13 tasks
Member
|
Can we remove the special cases for NixOS and Nixops? Or at least push them out of the XSL file |
Member
Author
That is the goal, but we'll need a migration window where both methods are available, at least for NixOps. |
Member
Author
|
I'm also hesitant to migrate NixOS immediately because its list of options is huge and tiny per-option overhead may be significant. |
Previously, the location logic was hardcoded, supporting only Nixpkgs and NixOps properly, leaving other uses of the module system without good location support.
b358768 to
11b33fc
Compare
Member
Author
|
I've described the follow-up work in #178572 |
1 task
Contributor
|
Successfully created backport PR #178573 for |
roberth
added a commit
to hercules-ci/nixpkgs
that referenced
this pull request
Jun 27, 2022
Feature was introduced in NixOS#174460, but wasn't supported in `mergeJSON.py` yet.
roberth
added a commit
to hercules-ci/nixpkgs
that referenced
this pull request
Jun 27, 2022
Feature was introduced in NixOS#174460, but wasn't supported in `mergeJSON.py` yet.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Previously, the location logic was hardcoded, supporting only
Nixpkgs and NixOps properly, leaving other uses of the module
system without good location support.
Usage is along the lines of
Now also fixes the Nixpkgs
configoptions doc file links. For broken links, see https://nixos.org/manual/nixpkgs/stable/#opt-allowAliases.ping @rycee
Things done
sandbox = trueset 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.shto update generated release notes