Skip to content

[Backport staging-25.05] opencv4: protobuf_21 -> protobuf#426106

Merged
ConnorBaker merged 2 commits intostaging-25.05from
backport-419335-to-staging-25.05
Jul 17, 2025
Merged

[Backport staging-25.05] opencv4: protobuf_21 -> protobuf#426106
ConnorBaker merged 2 commits intostaging-25.05from
backport-419335-to-staging-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jul 17, 2025

Bot-based backport to staging-25.05, triggered by a label in #419335.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

ConnorBaker and others added 2 commits July 17, 2025 13:38
@ConnorBaker @github-actions
opencv4: protobuf_21 -> protobuf
5c48e9c 
Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
(cherry picked from commit b5daea7)
@ZeroEcks @github-actions
opencv: use c++ 17 to fix protobuf support
d136302 
fixes #386327

(cherry picked from commit fbced4e)
(cherry picked from commit 3eb8b87)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jul 17, 2025
Merged
13 tasks
@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: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 4.workflow: backport This targets a stable branch labels Jul 17, 2025
@nix-owners nix-owners bot requested a review from basvandijk July 17, 2025 13:45
@ConnorBaker ConnorBaker self-assigned this Jul 17, 2025
@ConnorBaker
Copy link
Contributor

ConnorBaker commented Jul 17, 2025

Merging so it's included in the next staging-next for 25.05.

@ConnorBaker ConnorBaker merged commit c54dfa0 into staging-25.05 Jul 17, 2025
28 of 31 checks passed
@ConnorBaker ConnorBaker deleted the backport-419335-to-staging-25.05 branch July 17, 2025 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees

@ConnorBaker ConnorBaker

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ConnorBaker @ZeroEcks