nixos/systemd: convert extraConfig to rfc 42#426692
Conversation
080e11f to
0716528
Compare
f766037 to
ee9a541
Compare
ElvishJerricco
left a comment
There was a problem hiding this comment.
Code LGTM. We might want a release note, though I think you could argue the mkRemovedOptionModule and mkRenamedOptionModule take care of migration instructions sufficiently on their own.
@emilazy had mentioned on matrix that systemd.settings could potentially be an attrset of sections, but given that there's only one valid section I think that would just needlessly obscure the option documentation.
|
Adding a release notes entry is still a good idea, i just feared all the merge conflicts and wanted to rebase once in the end if necessary. With your approval, this went faster than expected, so i added them now. |
emilazy
left a comment
There was a problem hiding this comment.
Thanks, this seems good to me; a few more nits and I’d be happy to see this landed.
settings.Manager feels weird to me but I can’t come up with any concrete problem it’ll cause to change it down the line. If/when we migrate systemd.network.config we’ll need a thing to produce the section structure, so we can adjust this then.
There was a problem hiding this comment.
(I’d still like to see this RFC 42‐ized, but I agree that it can wait for another PR.)
…t.initrd.systemd.settings.Manager
…nager.ManagerEnvironment
eb25600 to
8d2b172
Compare
This option is now being ignored by systemd, so we do not need to explicitly define it.
This option is made uncondiotional in systemd 258 [1]. Earlier, it defaulted to true on kernels newer than 4.15, which applies to all supported nixos kernels. This means removing the option does not change behavior. [1] systemd/systemd@29da53d
cgroup accounting is enabled by default, and the option is scheduled for removal.
8d2b172 to
6cd6573
Compare
emilazy
left a comment
There was a problem hiding this comment.
Looks great to me, thank you!
Flake lock file updates:
• Updated input 'home-manager':
'github:nix-community/home-manager/0630790b31d4547d79ff247bc3ba1adda3a017d9' (2025-07-30)
→ 'github:nix-community/home-manager/0de18bd5c6681280d7ae017fa34ffd91bdcf0557' (2025-08-03)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/dc9637876d0dcc8c9e5e22986b857632effeb727' (2025-07-28)
→ 'github:nixos/nixpkgs/94def634a20494ee057c76998843c015909d6311' (2025-07-31)
- `systemd.extraConfig` replaced with RFC42-style option NixOS/nixpkgs#426692
• Updated input 'vpsadminos':
'github:vpsfreecz/vpsadminos/f0580af94a38240ed88da3de980ac3332612b255' (2025-07-30)
→ 'github:vpsfreecz/vpsadminos/5bdd1250a7a74694e29908bcd335992ee7bcc6d6' (2025-08-02)
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/89 |
|
Are you planning to convert |
|
ideally both |
|
if you want to do that though, feel free to open a PR. I won't block any motivated entity from contributing this before i do. |
Updates nixos-unstable to 2025-08-03. systemd.extraConfig was removed in NixOS/nixpkgs#426692
by using the new names See NixOS/nixpkgs#426692
by using the new names See NixOS/nixpkgs#426692
Converted
systemd.extraConfigandboot.initrd.systemd.extraConfigto rfc-42-stylesystemd.settings.Moved explicit definitions for
system.confto set settings instead.Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.