Skip to content

[Backport release-25.05] bikeshed: 5.1.2 -> 5.3.2; migrate to by-name#422394

Merged
matthiasbeyer merged 6 commits intoNixOS:release-25.05from
mdaniels5757:backport-421687-to-release-25.05
Jul 5, 2025
Merged

[Backport release-25.05] bikeshed: 5.1.2 -> 5.3.2; migrate to by-name#422394
matthiasbeyer merged 6 commits intoNixOS:release-25.05from
mdaniels5757:backport-421687-to-release-25.05

Conversation

@mdaniels5757
Copy link
Member

Manual backport of #416063 #416066 #416288 #421687 to release-25.05.

  • 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.

@mdaniels5757 mdaniels5757 changed the title [Backport release-25.05] bikeshed: 5.1.2 -> 5.3.2 [Backport release-25.05] bikeshed: 5.1.2 -> 5.3.2; migrate to by-name Jul 4, 2025
@mdaniels5757 mdaniels5757 force-pushed the backport-421687-to-release-25.05 branch from b45056b to 6b07a93 Compare July 4, 2025 12:08
@mdaniels5757 mdaniels5757 marked this pull request as draft July 4, 2025 12:10
@mdaniels5757 mdaniels5757 force-pushed the backport-421687-to-release-25.05 branch from 6b07a93 to b45056b Compare July 4, 2025 12:15
@mdaniels5757
Copy link
Member Author

Needs #422400.

@mdaniels5757 mdaniels5757 added the 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed label Jul 4, 2025
TheNeikos and others added 6 commits July 5, 2025 01:40
Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit 72443cf)
This was done upon their request

Suggested-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit c7d59fc)
Signed-off-by: Marcel Müller <neikos@neikos.email>
(cherry picked from commit 668cd63)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit aeadb01)
(cherry picked from commit 8e002d6)
(cherry picked from commit 099f576)
@mdaniels5757 mdaniels5757 force-pushed the backport-421687-to-release-25.05 branch from b45056b to 70b8197 Compare July 5, 2025 05:41
@nixpkgs-ci nixpkgs-ci bot added the 4.workflow: backport This targets a stable branch label Jul 5, 2025
@mdaniels5757 mdaniels5757 marked this pull request as ready for review July 5, 2025 05:48
@mdaniels5757 mdaniels5757 removed the 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed label Jul 5, 2025
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Jul 5, 2025
@mdaniels5757 mdaniels5757 removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 5, 2025
@matthiasbeyer
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 422394
Commit: 70b8197cfbb5b6012aff07eabc4fae02342f5b0c


x86_64-linux

✅ 2 packages built:
  • bikeshed
  • bikeshed.dist

@matthiasbeyer
Copy link
Contributor

I take the liberty to merge to stable here, please stable gods hit me if this is wrong.

@matthiasbeyer matthiasbeyer merged commit 042d0fd into NixOS:release-25.05 Jul 5, 2025
31 of 33 checks passed
@mdaniels5757 mdaniels5757 deleted the backport-421687-to-release-25.05 branch July 5, 2025 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants