Skip to content

Comments

util-linux, kubernetes, k3s: drop util-linux.withPatches#421985

Merged
numinit merged 3 commits intoNixOS:masterfrom
numinit:util-linux/remove-with-patches
Jul 5, 2025
Merged

util-linux, kubernetes, k3s: drop util-linux.withPatches#421985
numinit merged 3 commits intoNixOS:masterfrom
numinit:util-linux/remove-with-patches

Conversation

@numinit
Copy link
Contributor

@numinit numinit commented Jul 3, 2025

Closes #409339. This API was intended to be a temporary hack to fix Kubernetes and other consumers that relied on this specific util-linux mount behavior. Now that util-linux is correctly patched, we can drop this passthru.

cc: @NixOS/kubernetes @NixOS/k3s @DerRockWolf

This should be backported since #411662 was the equivalent for 25.05:

https://nixpk.gs/pr-tracker.html?pr=411662

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

numinit added 3 commits July 2, 2025 23:51
This, and commits to k3s and util-linux close NixOS#409339.
The util-linux.withPatches API was a temporary hack for the 25.05
release to fix Kubernetes, and is going away.

While we're at it, we should use util-linuxMinimal because we do not
need things such as systemd support for kubelet initialization.
This, as well as commits to kubernetes and util-linux, close NixOS#409339.
util-linux.withPatches was a temporary hack to unbreak Kubernetes for
the 25.05 release.
Closes NixOS#409339. This API was intended to be a temporary hack to fix
Kubernetes and other consumers that relied on this specific util-linux
mount behavior. Now that util-linux is correctly patched, we can drop
this passthru.
@numinit
Copy link
Contributor Author

numinit commented Jul 3, 2025

Checked by running the passthru tests, all work.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 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/) labels Jul 3, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/solved-downgrade-dependency-to-util-linux-in-a-remote-flake/65132/7

@numinit
Copy link
Contributor Author

numinit commented Jul 3, 2025

Really this passthru should have been called util-linux.withK0_8_ubernetesPatches...

@numinit numinit mentioned this pull request Jul 3, 2025
13 tasks
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 3, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 3, 2025
@numinit numinit merged commit 2ba055e into NixOS:master Jul 5, 2025
40 of 42 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jul 5, 2025

Successfully created backport PR for release-25.05:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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/` 8.has: port to stable This PR already has a backport to the stable release. 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. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

util-linux: clean up withPatches references post-25.05 release

5 participants