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
cargo: use bundled libgit2 #79930
Merged
Merged
cargo: use bundled libgit2 #79930
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
Mic92
approved these changes
Feb 12, 2020
Mic92
reviewed
Feb 12, 2020
Cargo uses git-rs which is made to be built against the bundled libgit2 version that hasn't been part of a stable release yet. Using our libgit2 instead of the master version fails during runtime as they are not compatible anymore. After the next libgit2 update we can try again but it is likely that there will also be yet another cargo release at that point in time…
andir
force-pushed
the
cargo-no-system-libgit2
branch
from
February 12, 2020 16:16
f3031a2
to
5c8612d
Compare
vcunat
approved these changes
Feb 12, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good at a quick glance, and it fixes rust-cbindgen
build for me.
I thought about doing a seperate output for these, but they're tiny compared to the size of the binary, so there's no point. (cherry picked from commit 0489c1b)
Picked #79850 on-top. Will be gone for a few hours. Please go ahead and merge if this looks fine. |
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Feb 13, 2020
cargo: use bundled libgit2 (cherry picked from commit b86512e)
dtzWill
added a commit
to dtzWill/nixpkgs
that referenced
this pull request
Feb 13, 2020
…git2" (rebuilds) This reverts commit 24432fa.
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 unbreaks cargo-vendor generated sources on master and potentially other breakage that I haven't found yet.
Cargo uses git-rs which is made to be built against the bundled libgit2
version that hasn't been part of a stable release yet. Using our libgit2
instead of the master version fails during runtime as they are not
compatible anymore.
After the next libgit2 update we can try again but it is likely that
there will also be yet another cargo release at that point in time…
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)cc @mweinelt