Skip to content

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

Closed
flokli wants to merge 1 commit intoNixOS:masterfrom
flokli:systemd-timesyncd-default
Closed

nixos/timesyncd: default explicit config to the empty list#335802
flokli wants to merge 1 commit intoNixOS:masterfrom
flokli:systemd-timesyncd-default

Conversation

@flokli
Copy link
Member

@flokli flokli commented Aug 19, 2024

This allows systemd-timesyncd to use NTP servers advertised via DHCP. Our current approach effectively hardcodes them to {0..4}.nixos.pool.ntp.org.

Closes #335050.

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (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.

This allows systemd-timesyncd to use NTP servers advertised via DHCP.
Our current approach effectively hardcodes them to
`{0..4}.nixos.pool.ntp.org`.

Closes NixOS#335050.
@flokli flokli requested review from a team, datafoo and doronbehar August 19, 2024 12:32
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 19, 2024
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Changes look good. Haven't tested, and I don't think it should be critical to test this. (I'm also not sure how to test this).

Copy link
Contributor

@datafoo datafoo left a comment

Choose a reason for hiding this comment

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

It looks good but I would prefer the approach of my own PR #335755 which does not break compatibility for those already setting networking.timeServers to something different than the default value.

default = config.networking.timeServers;
defaultText = literalExpression "config.networking.timeServers";
default = [ ];
defaultText = literalExpression "[]";
Copy link
Contributor

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?

@ofborg ofborg 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 Aug 19, 2024
@flokli flokli closed this Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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

Development

Successfully merging this pull request may close these issues.

nixos/timesyncd: does not use the NTP servers advertised by DHCP

3 participants