Skip to content

nixos/timesyncd: default explicit config to the empty list #335802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
flokli wants to merge 1 commit into from
Closed

nixos/timesyncd: default explicit config to the empty list #335802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nixos/doc/manual/release-notes/rl-2411.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions nixos/modules/system/boot/timesyncd.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ with lib;
'';
};
servers = mkOption {
default = config.networking.timeServers;
defaultText = literalExpression "config.networking.timeServers";
default = [ ];
defaultText = literalExpression "[]";
Copy link
Contributor

@datafoo datafoo Aug 19, 2024

Choose a reason for hiding this comment

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

Is this necessary to use defaultText with such value?

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.
'';
};
Expand Down