Skip to content

Comments

[Backport release-25.05] {k3s,nixos/kubernetes}: use util-linux.withPatches#411970

Merged
numinit merged 3 commits intorelease-25.05from
backport-409332-to-release-25.05
May 29, 2025
Merged

[Backport release-25.05] {k3s,nixos/kubernetes}: use util-linux.withPatches#411970
numinit merged 3 commits intorelease-25.05from
backport-409332-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented May 29, 2025 •
edited by numinit
Loading

Bot-based backport to release-25.05, triggered by a label in #409332.

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

numinit added 3 commits May 29, 2025 05:43
@numinit @github-actions
util-linux: hack: add withPatches passthru
34890fd 
TODO (#409339): Remove this hack. We had to add it to avoid a mass rebuild
for the 25.05 release to fix Kubernetes. Once the staging cycle referenced
in the above PR completes, this passthru and all consumers of it should go away.

(cherry picked from commit 99e6554)
@numinit @github-actions
k3s: use util-linuxMinimal.withPatches
59beefd 
(cherry picked from commit 0902abb)
@numinit @github-actions
nixos/kubernetes: use util-linux.withPatches
2870d0d 
(cherry picked from commit e14de85)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 29, 2025
Merged
13 tasks
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: k3s Kubernates distribution (https://k3s.io/) 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 29, 2025
@numinit
Copy link
Contributor

numinit commented May 29, 2025

@ofborg build nixosTests.kubernetes

@mahebubsk
Copy link

mahebubsk commented May 29, 2025

Lad bool

@numinit numinit merged commit ec75aa6 into release-25.05 May 29, 2025
16 of 22 checks passed
@bjornfor bjornfor deleted the backport-409332-to-release-25.05 branch May 29, 2025 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@euank euank Awaiting requested review from euank

@rorosen rorosen Awaiting requested review from rorosen

@Mic92 Mic92 Awaiting requested review from Mic92

@marcusramberg marcusramberg Awaiting requested review from marcusramberg

@yajo yajo Awaiting requested review from yajo

@frederictobiasc frederictobiasc Awaiting requested review from frederictobiasc

@wrmilling wrmilling Awaiting requested review from wrmilling

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@numinit @mahebubsk