Skip to content

[Backport release-25.05] util-linux, kubernetes, k3s: drop util-linux.withPatches #422587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
numinit merged 3 commits into from
Jul 6, 2025
Merged

[Backport release-25.05] util-linux, kubernetes, k3s: drop util-linux.withPatches #422587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adf964c
kubernetes: use util-linuxMinimal instead of util-linux.withPatches
numinit Jul 3, 2025
5c5b1d8
k3s: drop util-linux.withPatches
numinit Jul 3, 2025
c72e4ed
util-linux: drop withPatches
numinit Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions nixos/modules/services/cluster/kubernetes/kubelet.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,7 @@ in
[
gitMinimal
openssh
# TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
# for the 25.05 release. Once the staging cycle referenced in the above PR completes,
# switch back to plain util-linux.
util-linux.withPatches
util-linuxMinimal
iproute2
ethtool
thin-provisioning-tools
Expand Down
7 changes: 1 addition & 6 deletions pkgs/applications/networking/cluster/k3s/builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,6 @@ let
ldflags = versionldflags;
}).overrideAttrs
overrideContainerdAttrs;

# TODO (#409339): remove this patch. We had to add it to avoid a mass rebuild
# for the 25.05 release. Once the staging cycle referenced in the above PR completes,
# switch back to plain util-linuxMinimal.
k3sUtilLinux = util-linuxMinimal.withPatches;
in
buildGoModule rec {
pname = "k3s";
Expand Down Expand Up @@ -383,7 +378,7 @@ buildGoModule rec {
ipset
bridge-utils
ethtool
k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
util-linuxMinimal # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
conntrack-tools
runc
bash
Expand Down
12 changes: 0 additions & 12 deletions pkgs/by-name/ut/util-linux/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,18 +202,6 @@ stdenv.mkDerivation (finalPackage: rec {
'';

passthru = {
# 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.
withPatches = finalPackage.overrideAttrs (prev: {
patches = lib.unique (
prev.patches or [ ]
++ [
./fix-mount-regression.patch
]
);
});

updateScript = gitUpdater {
# No nicer place to find latest release.
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";
Expand Down