Skip to content

[Backport release-23.11]: cargo-* tools updates with newer rustPlatform#298312

Merged
matthiasbeyer merged 62 commits intoNixOS:release-23.11from
matthiasbeyer:backport-cargo-tools-updates-with-newer-rustc
Apr 22, 2024
Merged

[Backport release-23.11]: cargo-* tools updates with newer rustPlatform#298312
matthiasbeyer merged 62 commits intoNixOS:release-23.11from
matthiasbeyer:backport-cargo-tools-updates-with-newer-rustc

Conversation

@matthiasbeyer
Copy link
Contributor

@matthiasbeyer matthiasbeyer commented Mar 23, 2024

Description of changes

This was extracted from #298302 to be able to talk in a dedicated PR about the following issue:

The backports are only possible because of #298206 - that's why there are patches in this PR that make the updated attributes use the rustPackages_1_76.rustPlatform to build the packages. The patches that make this change are not on master, so I don't know what the policy for such a backport is.

All other patches (the actual package update commits) are cherry-pick -xsed.

I did not (yet) run this through nixpkgs-review as #298206 has not yet landed on nixos-23.11, and I don't want to recompile rustc on my infra 😆
Once nixos-23.11 is updated, I can of course do a nixpkgs-review run on this.

Lets discuss.

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 matthiasbeyer requested a review from figsoda March 23, 2024 08:52
@ofborg ofborg bot requested review from 06kellyjac, B4dM4n, kkharji and oxalica March 23, 2024 09:13
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 23, 2024
This was referenced Mar 25, 2024
Closed
Closed
@ofborg ofborg bot requested a review from turboMaCk March 28, 2024 14:58
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 28, 2024
@matthiasbeyer matthiasbeyer force-pushed the backport-cargo-tools-updates-with-newer-rustc branch 2 times, most recently from 65c8a3f to 41da92b Compare April 2, 2024 11:23
@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 7, 2024

Friendly ping @figsoda @06kellyjac @oxalica @B4dM4n @kharji

@matthiasbeyer matthiasbeyer mentioned this pull request Apr 7, 2024
Closed
1 task
matthiasbeyer and others added 12 commits April 12, 2024 14:52
@matthiasbeyer
cargo-semver-checks: Build with rustPackages_1_76
fe2c02b 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-semver-checks: 0.29.1 -> 0.30.0
ed4731a 
(cherry picked from commit a2b9457)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer
cargo-tally: Build with rustPackages_1_76
b98543e 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.31 -> 1.0.32
12d8abe 
(cherry picked from commit ffe99f3)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.32 -> 1.0.33
ccce0c2 
(cherry picked from commit 0c9dbdf)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@figsoda @matthiasbeyer
cargo-tally: 1.0.33 -> 1.0.34
e463279 
Diff: https://diff.rs/cargo-tally/1.0.33/1.0.34

Changelog: https://github.com/dtolnay/cargo-tally/releases/tag/1.0.34
(cherry picked from commit 29eabaf)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.34 -> 1.0.35
0620d02 
(cherry picked from commit 1360af0)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.35 -> 1.0.36
9b60240 
(cherry picked from commit 782350f)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.36 -> 1.0.38
dfb01fb 
(cherry picked from commit 68ee883)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.38 -> 1.0.39
c35c87f 
(cherry picked from commit dd2251d)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.39 -> 1.0.40
3de6fbf 
(cherry picked from commit 7f4bca6)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.40 -> 1.0.41
6d8941c 
(cherry picked from commit aa68800)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
r-ryantm added 2 commits April 14, 2024 08:09
@r-ryantm @matthiasbeyer
cargo-dist: 0.8.2 -> 0.11.1
1b4f8c2 
(cherry picked from commit f4a2170)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 26654903ab8423819096691ef0dc6eca352be4cd)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-dist: 0.11.1 -> 0.13.1
9251972 
(cherry picked from commit ec7438f)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit edc26b1a1e7a1849b310f84d9fd03bca41d40c27)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer matthiasbeyer mentioned this pull request Apr 14, 2024
Merged
@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 14, 2024

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

12 packages built:
  • cargo-binstall
  • cargo-chef
  • cargo-component
  • cargo-deny
  • cargo-dist
  • cargo-generate
  • cargo-llvm-lines
  • cargo-public-api
  • cargo-semver-checks
  • cargo-shuttle
  • cargo-tally
  • cargo-udeps

r-ryantm added 2 commits April 14, 2024 16:20
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.41 -> 1.0.42
aa63974 
(cherry picked from commit 64d0ec4)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-tally: 1.0.42 -> 1.0.43
8ef59c9 
(cherry picked from commit cf8ecfb)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer matthiasbeyer mentioned this pull request Apr 14, 2024
Merged
matthiasbeyer and others added 2 commits April 14, 2024 18:16
@matthiasbeyer
cargo-temp: Build with rustPackages_1_76
ec0ddf8 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@r-ryantm @matthiasbeyer
cargo-temp: 0.2.19 -> 0.2.20
2a19d10 
(cherry picked from commit be86ca7)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This was referenced Apr 14, 2024
Merged
Closed
@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 14, 2024

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

13 packages built:
  • cargo-binstall
  • cargo-chef
  • cargo-component
  • cargo-deny
  • cargo-dist
  • cargo-generate
  • cargo-llvm-lines
  • cargo-public-api
  • cargo-semver-checks
  • cargo-shuttle
  • cargo-tally
  • cargo-temp
  • cargo-udeps

@r-ryantm @matthiasbeyer
cargo-dist: 0.13.1 -> 0.13.2
ad1b78d 
(cherry picked from commit 30c60b8)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer matthiasbeyer mentioned this pull request Apr 20, 2024
Merged
matthiasbeyer and others added 2 commits April 21, 2024 14:38
@matthiasbeyer
cargo-modules: Build with rustPackages_1_76
7d28858 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@aktaboot @matthiasbeyer
cargo-modules: 0.11.2 -> 0.15.5
ce53412 
skip failing tests

(cherry picked from commit 821fa71)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This was referenced Apr 21, 2024
Closed
Merged
@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 21, 2024

I'll merge this tomorrow if there's no objections.

@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 21, 2024

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

1 package failed to build:
  • cargo-modules
13 packages built:
  • cargo-binstall
  • cargo-chef
  • cargo-component
  • cargo-deny
  • cargo-dist
  • cargo-generate
  • cargo-llvm-lines
  • cargo-public-api
  • cargo-semver-checks
  • cargo-shuttle
  • cargo-tally
  • cargo-temp
  • cargo-udeps

@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 21, 2024

Turns out cargo-modules fails, so I'll revert these patches

@matthiasbeyer matthiasbeyer reopened this Apr 21, 2024
@ofborg ofborg bot requested a review from kkharji April 21, 2024 13:00
@matthiasbeyer
Copy link
Contributor Author

matthiasbeyer commented Apr 21, 2024

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

13 packages built:
  • cargo-binstall
  • cargo-chef
  • cargo-component
  • cargo-deny
  • cargo-dist
  • cargo-generate
  • cargo-llvm-lines
  • cargo-public-api
  • cargo-semver-checks
  • cargo-shuttle
  • cargo-tally
  • cargo-temp
  • cargo-udeps

@matthiasbeyer matthiasbeyer merged commit 8f409d8 into NixOS:release-23.11 Apr 22, 2024
@matthiasbeyer matthiasbeyer deleted the backport-cargo-tools-updates-with-newer-rustc branch April 22, 2024 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@figsoda figsoda Awaiting requested review from figsoda

@oxalica oxalica Awaiting requested review from oxalica

@B4dM4n B4dM4n Awaiting requested review from B4dM4n

@turboMaCk turboMaCk Awaiting requested review from turboMaCk

@06kellyjac 06kellyjac Awaiting requested review from 06kellyjac

@kkharji kkharji Awaiting requested review from kkharji

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@matthiasbeyer @06kellyjac @kkharji @r-ryantm @figsoda @IogaMaster @mfrw @aktaboot