patch-shebangs: respect cross compilation for 18.09 #46108
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
Ericson2314
force-pushed
the
cross-patch-shebangs
branch
from
9815f15
to
afff603
Compare
9 tasks
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Maybe we should merge #43833 first just to make sure the changes work in all cases. I don't want to break patch shebangs in 18.09 (even if it looks harmless). This can be backported a little bit later. |
|
@matthewbauer err you mean merge this into |
|
Success on aarch64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: dhcpcd, stdenv Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: dhcpcd, stdenv Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-darwin (full log) Attempted: stdenv Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-darwin (full log) Attempted: stdenv The following builds were skipped because they don't evaluate on x86_64-darwin: dhcpcd Partial log (click to expand)
|
|
OK I think I see. It's fine if |
|
Alright! |
This ensures this change is safe last minute for 18.09. Master won't have this.
This hopefully makes patchShebangs respect cross compilation. It introduces the concept of the HOST_PATH. Nothing is ever executed on it but instead used as a way to get the proper path using ‘command -v’. Needs more testing. /cc @Ericson2314 @dtzWill Fixes NixOS#33956 Fixes NixOS#21138 (Modified backport of f069423. See previous commit to understand the differences between this and the original.)
Ericson2314
force-pushed
the
cross-patch-shebangs
branch
from
7eda08d
to
e9b6300
Compare
|
Changed the order so that #46542 for regular |
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: dhcpcd, stdenv Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-darwin (full log) Attempted: stdenv The following builds were skipped because they don't evaluate on x86_64-darwin: dhcpcd Partial log (click to expand)
|
|
Timed out, unknown build status on aarch64-linux (full log) Attempted: dhcpcd, stdenv Partial log (click to expand)
|
|
@Ericson2314 Looking at this now, I think I have found a bug in this. Lots of packages have bash scripts in their outputs but don't directly list bash as an input. Instead they get it from But for now, this will break in unexpected ways. I am going to revert this in staging-18.09 just to be safe. |
|
Ah man, all those little corner cases. Sure complicates everything. Good catch |
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.
Motivation for this change
This is a version of #43833 made more conservative to only affect cross builds (well, anything enabling
strictDeps). I hope that makes it conservative enough to land in 18.09. Sorry I didn't make this earlier, pre-fork.The idea is that if
strictDepsisn't defined,HOST_PATHis defined exactly the same asPATH. This means thatpatchShebangs,patchShebangs --build, andpatchShebangs --hostare all defined the same as each other and aspatchShebangsis today.I still like @matthewbauer's version for
stagingand 19.03 and beyond. The breakage it creates points us to things worth fixing, just not as part of the 18.09 deadline!Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)