chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Morgan Jones
2025-07-06 16:26:11 -07:00
committed by GitHub
parent d769d0459c c72e4edc5f
commit 8c14393fb2
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@@ -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

7
pkgs/applications/networking/cluster/k3s/builder.nix
View File

@@ -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

12
pkgs/by-name/ut/util-linux/package.nix
View File

@@ -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";