Skip to content

[Backport release-25.05] k3s: use patched util-linuxMinimal#408972

Merged
Mic92 merged 4 commits intorelease-25.05from
backport-407810-to-release-25.05
May 20, 2025
Merged

[Backport release-25.05] k3s: use patched util-linuxMinimal#408972
Mic92 merged 4 commits intorelease-25.05from
backport-407810-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented May 20, 2025

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

  • 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 20, 2025 06:52
@numinit @github-actions
nixos/k3s: get tests working again
c239eca 
Some of the attributes fetched throw, so tryEval them. Recurse into the
attribute set to pick up all the tests.

(cherry picked from commit 727809f)
@numinit @github-actions
k3s: use util-linuxMinimal
83085bb 
The full version of util-linux has systemd, NLS, and ncurses support.
k3s only uses a couple utilities from it at runtime, so use the minimal
version.

(cherry picked from commit 44d7b6d)
@numinit @github-actions
k3s: #405952: fix mount regression
3708c98 
Until #405952 is fixed, we can use our own util-linux to avoid breaking
k3s in the release. Revert this commit when that happens.

(cherry picked from commit 4cf4aca)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 20, 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 6.topic: k3s Kubernates distribution (https://k3s.io/) 4.workflow: backport This targets a stable branch labels May 20, 2025
@Mic92
k3s: better util-linux patch url
d0764b7 
The commit is in master so we don't need to point to the pull request
@Mic92
Copy link
Member

Mic92 commented May 20, 2025

Also added #408973 on top.

@Mic92 Mic92 merged commit d7fdb1c into release-25.05 May 20, 2025
6 of 7 checks passed
@Mic92 Mic92 deleted the backport-407810-to-release-25.05 branch May 20, 2025 06:57
@github-actions github-actions bot added 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 20, 2025
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 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

@Mic92 @numinit