Skip to content

rustPlatform.fetchCargoVendor: remove duplicate fetcher#525487

Merged
TomaSajt merged 1 commit into
NixOS:stagingfrom
andresilva:rust-fetch-cargo-vendor-remove-duplicate
Jun 2, 2026
Merged

rustPlatform.fetchCargoVendor: remove duplicate fetcher#525487
TomaSajt merged 1 commit into
NixOS:stagingfrom
andresilva:rust-fetch-cargo-vendor-remove-duplicate

Conversation

@andresilva

@andresilva andresilva commented May 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

In #512735 I introduced some duplication to allow the fix to go directly to master while avoiding a massive rebuild. This duplication should be removed by going through staging now.

Things done

nixpkgs-branch-check[bot]

This comment was marked as outdated.

Sign in to view

@andresilva andresilva force-pushed the rust-fetch-cargo-vendor-remove-duplicate branch from c080e53 to ddda3ed Compare May 29, 2026 09:03
@andresilva andresilva changed the title python3Packages.llama-cloud: 2.5.0 -> 2.7.0 rustPlatform.fetchCargoVendor: remove duplicate fetcher May 29, 2026
@nixpkgs-branch-check nixpkgs-branch-check Bot dismissed their stale review May 29, 2026 09:03

Review dismissed automatically

andresilva
andresilva commented May 29, 2026
View reviewed changes
Comment thread pkgs/build-support/rust/fetch-cargo-vendor-util.py
@@ -40,6 +40,7 @@ def create_http_session() -> requests.Session:
status_forcelist=[500, 502, 503, 504]

@andresilva andresilva May 29, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This was done as git mv -f fetch-cargo-vendor-util-v2.py fetch-cargo-vendor-util.py, unfortunately the diff still shows a removal + edit.

@andresilva andresilva requested a review from emilazy May 29, 2026 09:07
@nixpkgs-ci nixpkgs-ci Bot requested a review from TomaSajt May 29, 2026 09:12
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels May 29, 2026
r-burns
r-burns approved these changes Jun 2, 2026
View reviewed changes

@r-burns r-burns left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think this has been done several times before and this is standard practice. Is there a tracking issue or something for this kind of thing? I think the followup cleanup PR like this one should be pretty much automatic by now.

@TomaSajt

TomaSajt commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Yeah, sorry for not making any followup PRs myself, I was pretty busy.
Also, this was the first time when the issue was so urgent that we chose to have diverging FOD and non-FOD fetchers, so there was no prior practice AFAIK.

@TomaSajt TomaSajt added the backport staging-26.05 Backport PR automatically label Jun 2, 2026
@r-burns

r-burns commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

No worries at all, this was definitely a "drop everything at once and fix it" issue so I totally understand. Didn't consider the FOD-versus-non-FOD difference, that's also a complicating factor.

@TomaSajt TomaSajt added this pull request to the merge queue Jun 2, 2026
Merged via the queue into NixOS:staging with commit c86ea6e Jun 2, 2026
46 of 48 checks passed
@nixpkgs-ci nixpkgs-ci Bot mentioned this pull request Jun 2, 2026
Merged
@nixpkgs-ci

nixpkgs-ci Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Successfully created backport PR for staging-26.05:

@github-actions github-actions Bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@r-burns r-burns r-burns approved these changes
@nixpkgs-branch-check nixpkgs-branch-check[bot] nixpkgs-branch-check[bot] left review comments
@emilazy emilazy Awaiting requested review from emilazy
@TomaSajt TomaSajt Awaiting requested review from TomaSajt

Assignees

No one assigned

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. backport staging-26.05 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@andresilva @TomaSajt @r-burns