runInLinuxVM: fix createEmptyImage/preVM case#358705
Merged
Ma27 merged 2 commits intoNixOS:masterfrom Nov 24, 2024
Merged
Conversation
wolfgangwalther
approved these changes
Nov 24, 2024
Contributor
wolfgangwalther
left a comment
wolfgangwalther
left a comment
There was a problem hiding this comment.
I can confirm this fixes it, however not directly for the reason we assumed ($out). Consider this:
nix-build -E 'with import ./. {}; vmTools.runInLinuxVM (hello.overrideAttrs { __structuredAttrs = false; preVM = "exit 1"; })'
This is without structuredAttrs and will fail as expected.
But, before this PR:
nix-build -E 'with import ./. {}; vmTools.runInLinuxVM (hello.overrideAttrs { __structuredAttrs = true; preVM = "exit 1"; })'
The same with structuredAttrs will not fail - because $preVM is not even set. Thus, it will just happily proceed.
After this PR, this will fail as expected.
Thus, you might want to adjust the commit message slightly.
This is required for `preVM` which can be arbitrary code: e.g. `vmTools.createEmptyImage` assumes the presence of `$out` in its default configuration. Also, before this patch, `preVM` wasn't even set in the `__structuredAttrs` case.
Ma27
force-pushed
the
fix-runInLinuxVM
branch
from
11f639e to
4e2ce1b
Compare
Member
Author
|
Added a note to the commit message. |
This was referenced Nov 26, 2024
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
3 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.
When this is used, the existance of
$outis assumed, however this is not the case for structured attrs. This PR adds that.Also, an obsolete, broken
rmdiris removed fromapptainer.tests.image-hello-cowsay.Follows up on #354535.
cc @ShamrockLee @wolfgangwalther
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.