diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 2b68d876100c9..b5d16f0e27377 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -363,6 +363,14 @@ - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246). +- `services.timesyncd.servers` now defaults to an empty list, allowing + systemd-networkd to configure NTP servers advertised by DHCP, rather them being + hardcoded to `{0..3}.nixos.pool.ntp.org`. + `systemd` still uses these as fallback in case none are announced via DHCP, or + `UseNTP=no` is configured on that link. + You can enforce to keep using `{0..3}.nixos.pool.ntp.org` in all cases by + manually setting `services.timesyncd.servers` back to these hostnames. + - Cinnamon has been updated to 6.2. - Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default. - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index f93064569bf68..6574f0b78dd8e 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -16,13 +16,13 @@ with lib; ''; }; servers = mkOption { - default = config.networking.timeServers; - defaultText = literalExpression "config.networking.timeServers"; + default = [ ]; + defaultText = literalExpression "[]"; type = types.listOf types.str; description = '' The set of NTP servers from which to synchronise. - Note if this is set to an empty list, the defaults systemd itself is - compiled with ({0..4}.nixos.pool.ntp.org) apply, + In case this is set to an empty list (the default), the time servers + systemd itself is compiled with ({0..4}.nixos.pool.ntp.org) apply. In case you want to disable timesyncd altogether, use the `enable` option. ''; };