Rely on upstream for extracting nixpkgs options #460
Merged
Conversation
This file contains 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
This comment was marked as outdated.
This comment was marked as outdated.
Closed
|
OK, by using |
ysndr
approved these changes
May 19, 2022
There was a problem hiding this comment.
That looks like quite a drop in replacement for nixpkgs.
The benefits are good in the sense of nixpkgs the only thing we need to watch for is that the output format does not diverge from reading other flakes' options once we do expose those on the frontend.
If it imports I'm fine with this
Use the `options.json` generated in nixpkgs to be more in sync with the manual. Also fixes usage of `nixpkgs-archive` with local paths.
|
Starting an import now |
13 tasks
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.
Instead of extracting options from nixpkgs ourselves in
flake_info.nix, use the generatedoptions.json. As a result:options.json) Invisible options are not imported anymore. This includes removed/aliased/etc options, which proved to be confusing for some people: Missing description for networking.interfaces.<name>.ipAddress nixpkgs#164453. Note that there's some discussion in that issue about making those options visible in the manual and clearly indicating that they are removed/aliased/etc, but this is currently not the case and I think we should align with the nixos manual.virtualisation.diskSizeare now imported because of https://github.com/NixOS/nixpkgs/blob/fe9906cb4896d70d86452d76d11838025ffd6532/nixos/modules/misc/documentation.nix#L11.Also, we can make the
flakeargument toflake_info.nixoptional, which fixesnixpkgs-archive's option import for local paths, and use--argstr flakeinstead of--arg flakeso that we can pass flakes without a colon (e.g. flakes from the registry or paths).Related to #447