replaceVarsWith: fix checkPhase with dir set#365347
Merged
philiptaron merged 2 commits intoNixOS:stagingfrom Dec 16, 2024
Merged
replaceVarsWith: fix checkPhase with dir set#365347philiptaron merged 2 commits intoNixOS:stagingfrom
philiptaron merged 2 commits intoNixOS:stagingfrom
Conversation
github-actions
Bot
added
6.topic: nixos
This covers cases which need to use replaceVarsWith because the use isExecutable = true.
wolfgangwalther
force-pushed
the
replace-vars-with-dir
branch
from
c873e65 to
e58e0c1
Compare
philiptaron
approved these changes
Dec 15, 2024
Contributor
philiptaron
left a comment
philiptaron
left a comment
There was a problem hiding this comment.
I do wonder whether the inherit (stdenv) shell uses meant to be runtimeShell, but let's keep them as-is.
Contributor
|
I'm going to do a build of stdenv and run the tests then I intend to merge. |
ofborg
Bot
added
10.rebuild-darwin-stdenv
2 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.
The newly introduced replaceVarsWith didn't run the checkPhase properly when
dirwas set. Extended the test-suite to cover those cases, too.Also move all the remaining cases of "substituteAll + isExecutable" to replaceVarsWith.
Working towards #237216.
CC @philiptaron
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.