nixos/nixpkgs: fix assertion text & show def files #343212
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
github-actions
bot
added
6.topic: nixos
ofborg
bot
added
10.rebuild-darwin: 0
|
This looks alright. I think the mistake was made because Could you add a regression test to |
The assertion message should include the `nixpkgs.config` value, however it currently includes the entire `nixpkgs.config` _option_. This means the type, declarations, definitions, etc were all printed.
MattSturgeon
force-pushed
the
fix-nixpkgs-module-assert
branch
from
3a45d9f
to
6d9dfef
Compare
Good idea! I've added one based on the existing "ambiguous" test. |
|
Thank you! |
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
configassertion textconfigassertionThe existing
opt.pkgs.isDefined -> cfg.config == {}assertion was printing thenixpkgs.configoption instead of the value. This PR fixes that, and in a follow-up commit also prints the defining files.I was tempted to use
lib.options.showDefs, however I felt it made more sense in this instance to show the full and final value in its entirety and then only list the defining files. This avoids an unnecessarily long and repetitive assertion message. Note thatshowDefswould show part of each definition, each truncated after a few lines.The assertion in question was introduced in ce87196 (#257458 Sept 2023) by @K900 and hasn't been touched since.
cc (some) original reviewers: @roberth @khaneliman @FRidh @SuperSandro2000
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.