diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix index ffe24c0ef0be..770fbee2a844 100644 --- a/nixos/modules/services/monitoring/tuptime.nix +++ b/nixos/modules/services/monitoring/tuptime.nix @@ -45,7 +45,7 @@ in { services = { tuptime = { - description = "the total uptime service"; + description = "The total uptime service"; documentation = [ "man:tuptime(1)" ]; after = [ "time-sync.target" ]; wantedBy = [ "multi-user.target" ]; @@ -59,10 +59,9 @@ in { }; }; - tuptime-oneshot = mkIf cfg.timer.enable { - description = "the tuptime scheduled execution unit"; + tuptime-sync = mkIf cfg.timer.enable { + description = "Tuptime scheduled sync service"; serviceConfig = { - StateDirectory = "tuptime"; Type = "oneshot"; User = "_tuptime"; ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; @@ -70,8 +69,8 @@ in { }; }; - timers.tuptime = mkIf cfg.timer.enable { - description = "the tuptime scheduled execution timer"; + timers.tuptime-sync = mkIf cfg.timer.enable { + description = "Tuptime scheduled sync timer"; # this timer should be started if the service is started # even if the timer was previously stopped wantedBy = [ "tuptime.service" "timers.target" ]; @@ -80,7 +79,7 @@ in { timerConfig = { OnBootSec = "1min"; OnCalendar = cfg.timer.period; - Unit = "tuptime-oneshot.service"; + Unit = "tuptime-sync.service"; }; }; }; diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index 7c13df3ec15e..d7034dd76223 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "sha256-6N4dqgLOhWqVR8GqlBUxHWy10AHBZ4aZbdkw5SOxxBQ="; + sha256 = "sha256-s0VtKOaSPQlF58/2m/DwYDuHHPGnHVAJMA/p3hISTNE="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Total uptime & downtime statistics utility"; homepage = "https://github.com/rfrail3/tuptime"; + changelog = "https://github.com/rfrail3/tuptime/blob/master/CHANGELOG"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.evils ];