Skip to content

Comments

{k3s,nixos/kubernetes}: use util-linux.withPatches#409332

Merged
numinit merged 3 commits intoNixOS:masterfrom
numinit:util-linux/withPatches
May 29, 2025
Merged

{k3s,nixos/kubernetes}: use util-linux.withPatches#409332
numinit merged 3 commits intoNixOS:masterfrom
numinit:util-linux/withPatches

Conversation

@numinit
Copy link
Contributor

@numinit numinit commented May 21, 2025 •
edited
Loading

As documented:

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.

Should fix #408044 which affected both k3s and kubernetes, without a mass rebuild.

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 24.11 and 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 24.11 and 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.

Add a 👍 reaction to pull requests you find important.

@numinit numinit requested review from DerRockWolf, Mic92 and alyssais May 21, 2025 08:33
@github-actions github-actions bot added 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 May 21, 2025
@numinit numinit mentioned this pull request May 21, 2025
Closed
3 tasks
@numinit
Copy link
Contributor Author

numinit commented May 21, 2025

Adapted from @DerRockWolf's #405952 and should work without the world rebuild.

numinit
numinit commented May 21, 2025
View reviewed changes
pkgs/by-name/ut/util-linux/package.nix Outdated
Copy link
Contributor Author

@numinit numinit May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this lib.unique is written in a way where, after the staging merge, withPatches and normal util-linux will eval to the same outpath.

@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 21, 2025
@numinit numinit mentioned this pull request May 21, 2025
Closed
@numinit numinit force-pushed the util-linux/withPatches branch from 2f1b60e to ff18672 Compare May 21, 2025 08:53
@numinit
Copy link
Contributor Author

numinit commented May 21, 2025

Simply corrected the issue number referenced in comments, no functional differences. kubernetes tests still pass.

rorosen
rorosen approved these changes May 21, 2025
View reviewed changes
@numinit numinit force-pushed the util-linux/withPatches branch from ff18672 to cf33e5b Compare May 21, 2025 09:41
numinit
numinit commented May 21, 2025
View reviewed changes
nixos/modules/services/cluster/kubernetes/kubelet.nix Outdated
Copy link
Contributor Author

@numinit numinit May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't sure whether to switch this to minimal (there is gitMinimal, above). I guess it could make sense, but I'm also afraid of breaking kubernetes somehow by doing that, and we can now build a patched util-linux (not minimal) without rebuilding the world anyway.

@numinit
Copy link
Contributor Author

numinit commented May 21, 2025

One more cc to @NixOS/k3s, and thank you for your patience with this annoying regression.

alyssais
alyssais reviewed May 21, 2025
View reviewed changes
pkgs/by-name/ut/util-linux/package.nix Outdated
Copy link
Member

@alyssais alyssais May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems pretty overcomplicated for me for something that I don't remember having come up very much before…

Copy link
Contributor Author

@numinit numinit May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we should just do overrides in two places then? I was split between both approaches but could see merits to either because it's a oneoff.

Copy link
Member

@alyssais alyssais May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think having the passthru is fine but I'd remove it again once we don't need it any more.

Copy link
Contributor Author

@numinit numinit May 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, yeah, completely fair. People should not rely on this. I'll update the tracking issue and fix the comment to indicate that this is a temporary hack.

Copy link
Contributor Author

@numinit numinit May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good now.

numinit added 3 commits May 21, 2025 12:51
@numinit
util-linux: hack: add withPatches passthru
99e6554 
TODO (NixOS#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.
@numinit
k3s: use util-linuxMinimal.withPatches
0902abb
@numinit
nixos/kubernetes: use util-linux.withPatches
e14de85
@numinit numinit force-pushed the util-linux/withPatches branch from cf33e5b to e14de85 Compare May 21, 2025 19:52
@numinit numinit requested a review from alyssais May 21, 2025 20:02
@numinit numinit mentioned this pull request May 28, 2025
Merged
13 tasks
@numinit numinit merged commit 79aa28e into NixOS:master May 29, 2025
32 of 33 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented May 29, 2025

Successfully created backport PR for release-25.05:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 29, 2025
Merged
1 task
@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 29, 2025
@nixos-discourse
Copy link

nixos-discourse commented Jun 2, 2025

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

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

plaflamme added a commit to plaflamme/k0s-nix that referenced this pull request Jun 6, 2025
@plaflamme
fix: use patched util-linux package
643593d 
Applies the same fix from NixOS/nixpkgs#409332
plaflamme added a commit to plaflamme/k0s-nix that referenced this pull request Jun 6, 2025
@plaflamme
fix: use patched util-linux package
8e9a07e 
Applies the same fix from NixOS/nixpkgs#409332
plaflamme added a commit to plaflamme/k0s-nix that referenced this pull request Jun 6, 2025
@plaflamme
fix: use patched util-linux package
c897263 
Applies the same fix from NixOS/nixpkgs#409332
@plaflamme plaflamme mentioned this pull request Jun 6, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rorosen rorosen rorosen approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@DerRockWolf DerRockWolf Awaiting requested review from DerRockWolf

@euank euank Awaiting requested review from euank

@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

@alyssais alyssais Awaiting requested review from alyssais

Assignees

No one assigned

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

k3s: failed to prepare subPath

4 participants

@numinit @nixos-discourse @alyssais @rorosen