-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build-support/rust: Organize #144193
Merged
Merged
build-support/rust: Organize #144193
+50
−35
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
Eval error looks legit. |
- `toRustTarget` and friends pulled out from rust tools into rust library. Since they don't depend on any packages they can be more widely useable. - `build-rust-package` gets its own directory - `fetch-cargo-tarball` gets its own directory
c20d442
to
18ed048
Compare
Backport failed for Please cherry-pick the changes locally. git fetch origin release-21.05
git worktree add -d .worktree/backport-144193-to-release-21.05 origin/release-21.05
cd .worktree/backport-144193-to-release-21.05
git checkout -b backport-144193-to-release-21.05
ancref=$(git merge-base 3b0bff383f8e894b1ee7a30b62c8b727a68511df 18ed048c7b27e288a6c9ba894790a7e67ed5080d)
git cherry-pick -x $ancref..18ed048c7b27e288a6c9ba894790a7e67ed5080d |
1 similar comment
Backport failed for Please cherry-pick the changes locally. git fetch origin release-21.05
git worktree add -d .worktree/backport-144193-to-release-21.05 origin/release-21.05
cd .worktree/backport-144193-to-release-21.05
git checkout -b backport-144193-to-release-21.05
ancref=$(git merge-base 3b0bff383f8e894b1ee7a30b62c8b727a68511df 18ed048c7b27e288a6c9ba894790a7e67ed5080d)
git cherry-pick -x $ancref..18ed048c7b27e288a6c9ba894790a7e67ed5080d |
12 tasks
this created a merge conflict in #144730 |
@figsoda OK I will fix |
On the command line, it was conveniently not a conflict! Fixed. |
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
toRustTarget
and friends pulled out from rust tools into rustlibrary. Since they don't depend on any packages they can be more
widely useable.
build-rust-package
gets its own directoryfetch-cargo-tarball
gets its own directoryThings done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)