Skip to content
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 2 commits into from Feb 12, 2020
Merged

cargo: use bundled libgit2 #79930

merged 2 commits into from Feb 12, 2020

Conversation

@andir
Copy link
Member

@andir andir commented Feb 12, 2020

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @mweinelt

@andir andir requested review from LnL7 and Mic92 as code owners Feb 12, 2020
@ofborg ofborg bot added the 6.topic: rust label Feb 12, 2020
@Mic92
Mic92 approved these changes 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 andir force-pushed the andir:cargo-no-system-libgit2 branch from f3031a2 to 5c8612d Feb 12, 2020
@ofborg ofborg bot requested a review from retrry Feb 12, 2020
@andir andir mentioned this pull request Feb 12, 2020
3 of 10 tasks complete
@Mic92 Mic92 mentioned this pull request Feb 12, 2020
4 of 10 tasks complete
@vcunat
vcunat approved these changes Feb 12, 2020
Copy link
Member

@vcunat vcunat left a comment

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)
@andir
Copy link
Member Author

@andir andir commented Feb 12, 2020

Picked #79850 on-top. Will be gone for a few hours. Please go ahead and merge if this looks fine.

@andir andir merged commit b86512e into NixOS:master Feb 12, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
cargo on aarch64-linux Success
Details
cargo on x86_64-darwin Success
Details
cargo on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
dtzWill added 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.