From cfc9c7211e2665b738b5a5dde1cf3d163e4b0806 Mon Sep 17 00:00:00 2001 From: "quentin@aristote.fr" Date: Fri, 30 Aug 2024 19:01:03 +0200 Subject: nixos: nix: lib.mkForce nixos-upgrade (compatible with older nixpkgs) --- modules/nixos/personal/nix.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'modules/nixos') diff --git a/modules/nixos/personal/nix.nix b/modules/nixos/personal/nix.nix index 268c330..93e14e8 100644 --- a/modules/nixos/personal/nix.nix +++ b/modules/nixos/personal/nix.nix @@ -79,15 +79,20 @@ in { path = [pkgs.git]; personal.monitor = true; }; - nixos-upgrade = { + nixos-upgrade = let + priorize = + if (builtins.compareVersions lib.trivial.version "24.11" > 0) + then x: x + else lib.mkForce; + in { preStart = "${pkgs.host}/bin/host firecat53.net"; # Check network connectivity serviceConfig = { Restart = "on-failure"; - RestartSec = "120"; + RestartSec = priorize "120"; }; unitConfig = { - StartLimitIntervalSec = 600; - StartLimitBurst = 2; + StartLimitIntervalSec = priorize 600; + StartLimitBurst = priorize 2; }; after = ["flake-update.service"]; wants = ["flake-update.service"]; -- cgit v1.2.3