Merge pull request #30563 from michaelpj/imp/tzupdate

tzupdate: init at 1.2.0 (+ service)

Changed files
+72
nixos
modules
pkgs
applications
misc
tzupdate
top-level
+1
nixos/modules/module-list.nix
···
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/taskserver
./services/misc/uhub.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
···
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/taskserver
+
./services/misc/tzupdate.nix
./services/misc/uhub.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
+45
nixos/modules/services/misc/tzupdate.nix
···
···
+
{ config, lib, pkgs, ... }:
+
+
with lib;
+
+
let
+
cfg = config.services.tzupdate;
+
in {
+
options.services.tzupdate = {
+
enable = mkOption {
+
type = types.bool;
+
default = false;
+
description = ''
+
Enable the tzupdate timezone updating service. This provides
+
a one-shot service which can be activated with systemctl to
+
update the timezone.
+
'';
+
};
+
};
+
+
config = mkIf cfg.enable {
+
# We need to have imperative time zone management for this to work.
+
# This will give users an error if they have set an explicit time
+
# zone, which is better than silently overriding it.
+
time.timeZone = null;
+
+
# We provide a one-shot service which can be manually run. We could
+
# provide a service that runs on startup, but it's tricky to get
+
# a service to run after you have *internet* access.
+
systemd.services.tzupdate = {
+
description = "tzupdate timezone update service";
+
wants = [ "network-online.target" ];
+
after = [ "network-online.target" ];
+
+
serviceConfig = {
+
Type = "oneshot";
+
# We could link directly into pkgs.tzdata, but at least timedatectl seems
+
# to expect the symlink to point directly to a file in etc.
+
# Setting the "debian timezone file" to point at /dev/null stops it doing anything.
+
ExecStart = "${pkgs.tzupdate}/bin/tzupdate -z /etc/zoneinfo -d /dev/null";
+
};
+
};
+
};
+
+
meta.maintainers = [ maintainers.michaelpj ];
+
}
+24
pkgs/applications/misc/tzupdate/default.nix
···
···
+
{ stdenv, python }:
+
+
let
+
inherit (python.pkgs) buildPythonApplication fetchPypi requests;
+
in
+
buildPythonApplication rec {
+
name = "${pname}-${version}";
+
pname = "tzupdate";
+
version = "1.2.0";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk";
+
};
+
+
propagatedBuildInputs = [ requests ];
+
+
meta = with stdenv.lib; {
+
description = "Update timezone information based on geoip.";
+
homepage = https://github.com/cdown/tzupdate;
+
maintainers = [ maintainers.michaelpj ];
+
license = licenses.unlicense;
+
};
+
}
+2
pkgs/top-level/all-packages.nix
···
timetrap = callPackage ../applications/office/timetrap { };
tinc = callPackage ../tools/networking/tinc { };
tie = callPackage ../development/tools/misc/tie { };
···
timetrap = callPackage ../applications/office/timetrap { };
+
tzupdate = callPackage ../applications/misc/tzupdate { };
+
tinc = callPackage ../tools/networking/tinc { };
tie = callPackage ../development/tools/misc/tie { };