rustBuildCrate: properly handle cargo env pragmas with spaces #199300
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
ofborg
bot
added
10.rebuild-darwin: 0
|
Ah, this breaks on multiple variables being present: I guess splitting on spaces is what made it work before. I'll fix the patch. |
Aha, this patch actually prints empty line if nothing matches... Trying to figure out how to get it to work nicely while still producing escaped stuff... |
There are two problems: first that we end up splitting on spaces in the loop. Even when that is fixed, we still would split on spaces in the `export` inside the loop. We need to guard against both. Fixes NixOS#199298 Confirmed that it fixes the case mentioned in the ticket: ```console [nix-develop]$ $(nix-build -I nixpkgs=/home/shana/programming/nixpkgs Cargo.nix -A rootCrate.build --no-out-link)/bin/nix-rustc-env-escape-repro Expecting three words, got: first second third ``` I think this is going to cause a rebuild of every Rust package even if they were unaffected, not much we can do here.
Fuuzetsu
force-pushed
the
escape-rust-exports
branch
from
db620b7 to
233205c
Compare
|
OK, now I think it's ready. I made a derp with escaping myself so it didn't work if multiple lines were present. I addressed the issue. |
|
I've tested this patch for a week with crate2nix, no problems so far 👍 @aanderse can you merge this one ? |
|
As another data point, we've been running it for 2 weeks on a medium(?) size workspace: No issues. |
aanderse
approved these changes
Nov 16, 2022
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.
There are two problems: first that we end up splitting on spaces in the loop. Even when that is fixed, we still would split on spaces in the
exportinside the loop. We need to guard against both.Fixes #199298
Confirmed that it fixes the case mentioned in the ticket:
I think this is going to cause a rebuild of every Rust package even if they were unaffected, not much we can do here.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes