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

[Backport release-23.11]: cargo-* tools updates #298302

Merged

Conversation

matthiasbeyer
Copy link
Contributor

@matthiasbeyer matthiasbeyer commented Mar 23, 2024

Description of changes

Now that #298206 is landed, we have a new-enough rustc on release-23.11 to be able to compile these updates. Some backports failed before because rustc was too old on the release channel, but after above PR landed, these should all go through.

This backports cargo-* binaries up to current master (a986eec) to the release-23.11 branch.

All commits here are cherry-pick -xsed.

I will run this PR now through nixpkgs-review, which might take a while.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@matthiasbeyer
Copy link
Contributor Author

Meh, I didn't notice that the aforementioned PR actually does not update the rustc version on stable, but only introduce a new attribute for the newer rust infra.

I am not sure whether we want to introduce patches only on the release-23.11 branch just to make some of the packages from this PR compile with another rust infra than on master.
I suppose not, so I think I will rebase this PR shortly to remove all patches that touch packages that do not build.

Sorry for the confusion here.

@matthiasbeyer
Copy link
Contributor Author

Uh, ofborg thinks this is large. So I guess I will also rebase this to the staging-23.11 branch.

@matthiasbeyer
Copy link
Contributor Author

Result of nixpkgs-review pr 298302 run on x86_64-linux 1

9 packages failed to build:
  • cargo-binstall
  • cargo-chef
  • cargo-component
  • cargo-deny
  • cargo-semver-checks
  • cargo-show-asm
  • cargo-shuttle
  • cargo-tally
  • cargo-udeps
10 packages built:
  • cargo-audit
  • cargo-c
  • cargo-codspeed
  • cargo-cyclonedx
  • cargo-generate
  • cargo-llvm-cov
  • cargo-nextest
  • cargo-tauri
  • cargo-whatfeatures
  • cargo-zigbuild

CobaltCause and others added 20 commits March 23, 2024 09:20
(cherry picked from commit 9c1c75d)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit a2f71e1)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit c46ca8c)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 3314fac)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 3d23162)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diff: rust-cross/cargo-zigbuild@v0.17.5...v0.18.0

Changelog: https://github.com/messense/cargo-zigbuild/releases/tag/v0.18.0
(cherry picked from commit 9c933f9)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 88b307e)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit f0c83f6)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 428fd55)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 9aaea6c)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit a536abd)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit fa33071)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit bb5df56)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@co-authored-by: @Reasonable-Solutions <carl.hedgren@nav.no>

(cherry picked from commit 99df6a7)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit babbddc)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 03351c0)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 03d5211)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diff: lu-zero/cargo-c@v0.9.24...v0.9.29
(cherry picked from commit 6d5c84f)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
(cherry picked from commit f6c0c11)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit b660c6f)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer matthiasbeyer force-pushed the backport-cargo-tools-updates branch from ebe9896 to 798c21d Compare March 23, 2024 08:20
@matthiasbeyer
Copy link
Contributor Author

Okay, I removed all commits that touched attributes that do not build with the older rustc.

I am not 100% sure how to do a proper rebase against staging-23.11 here without accidentially notifying a lot of people,... should I simply close this PR and open a new one against staging-23.11 with the rebased commits?

Also, please review. (nixpkgs-review running, should post shortly).

@matthiasbeyer matthiasbeyer requested review from figsoda and CobaltCause and removed request for CobaltCause March 23, 2024 08:22
@matthiasbeyer
Copy link
Contributor Author

Result of nixpkgs-review pr 298302 run on x86_64-linux 1

10 packages built:
  • cargo-audit
  • cargo-c
  • cargo-codspeed
  • cargo-cyclonedx
  • cargo-generate
  • cargo-llvm-cov
  • cargo-nextest
  • cargo-tauri
  • cargo-whatfeatures
  • cargo-zigbuild

@matthiasbeyer
Copy link
Contributor Author

Friendly ping @CobaltCause @figsoda

1 similar comment
@matthiasbeyer
Copy link
Contributor Author

Friendly ping @CobaltCause @figsoda

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit fb8e5de)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 3be04b3)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer matthiasbeyer mentioned this pull request Apr 7, 2024
13 tasks
Copy link
Contributor

@CobaltCause CobaltCause left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All changed packages built for me, and I tested cargo-llvm-cov against a project and it worked fine.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Apr 8, 2024
@matthiasbeyer
Copy link
Contributor Author

I'll merge them, as stable maintainers seem to be unresponsive.

@matthiasbeyer matthiasbeyer merged commit 365e240 into NixOS:release-23.11 Apr 8, 2024
22 of 23 checks passed
@matthiasbeyer matthiasbeyer deleted the backport-cargo-tools-updates branch April 8, 2024 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.