lib: modules.sh should check JSON output for predictability (23.05 backport)#275268
Merged
infinisil merged 2 commits intoNixOS:staging-23.05from Dec 19, 2023
Merged
Conversation
NixOS/nix#9606 changes how values are printed in some cases. This updates the lib tests to work with the new output format, which should be familiar to `nix repl` users.
9999years
force-pushed
the
lib-test-modules-json-23.05-backport
branch
from
fd186a5 to
5676777
Compare
ofborg
bot
added
10.rebuild-darwin: 0
Member
|
Needs to be updated with the changes from the main PR. And this should also be backported to 23.11 if we backport to 23.05. Note that in most cases you can automatically get a bot to do backports for you by adding the |
Currently, the `lib/tests/modules.sh` test checks the output of `nix-instantiate --eval` without `--json`, which outputs an unspecified human-readable format. This patch modifies `modules.sh` to use the `--json` output instead, to be robust against future changes to `nix-instantiate` output.
9999years
force-pushed
the
lib-test-modules-json-23.05-backport
branch
from
5676777 to
0ceeea0
Compare
Contributor
Author
|
Updated, ready for review! |
Contributor
Author
|
Put up a 23.11 backport in #275462 too. |
9999years
changed the title
modules.sh should check JSON output for predictability (23.05 backport)
13 tasks
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
2 participants
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
Backport of #275264.
Currently, the
lib/tests/modules.shtest checks the output ofnix-instantiate --evalwithout--json, which outputs an unspecified human-readable format.This patch modifies
modules.shto use the--jsonoutput instead, to be robust against future changes tonix-instantiateoutput.See also: NixOS/nix#9606
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.