diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index ca7b524081f63..9ab5d0baf8c7e 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -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 diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index e2662f9894524..6d23342c91363 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -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"; @@ -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 diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 702cc21ebd6a3..92b7785d53f08 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -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";