Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 97dba166cfc8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c3116cdce215
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 20, 2021

  1. networking, chrony, ntpd, timesyncd: add timeServers option type

    @Scriptkiddi
    Scriptkiddi committed Jan 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    samueljsb Samuel Searles-Bryant
    SSH Key Fingerprint: UG1vbpwfv/yF8hRSqV7FLQGL2iSyjGsdQ/WDrm5be+I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1572940 View commit details

  2. Merge pull request #110122 from helsinki-systems/timeservers-option-type 

    networking, chrony, ntpd, timesyncd: add timeServers option type
    @Lassulus
    Lassulus authored Jan 20, 2021
    Copy the full SHA
    c3116cd View commit details
1 change: 1 addition & 0 deletions nixos/modules/config/networking.nix
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ in
"2.nixos.pool.ntp.org"
"3.nixos.pool.ntp.org"
];
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';
1 change: 1 addition & 0 deletions nixos/modules/services/networking/ntp/chrony.nix
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ in

servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';
1 change: 1 addition & 0 deletions nixos/modules/services/networking/ntp/ntpd.nix
View file
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@ in

servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';
1 change: 1 addition & 0 deletions nixos/modules/system/boot/timesyncd.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ with lib;
};
servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';