From 5aaf46809bed7589e4b48ec257b93351d57aa81a Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Tue, 14 Apr 2020 21:14:12 -0700 Subject: [PATCH 1/1] Make 'auto-upgrade' available in path "systemctl start nixos-upgrade" no longer works to force an immediate run since the start delay was added. --- modules/auto-upgrade.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix index b493ac0..974ebb7 100644 --- a/modules/auto-upgrade.nix +++ b/modules/auto-upgrade.nix @@ -40,7 +40,22 @@ in { nixpkgs.overlays = [ (import ../overlays/keyedgit.nix) (import ../overlays/pinch.nix) + (self: super: { + auto-upgrade = super.writeShellScriptBin "auto-upgrade" '' + set -e + ( + cd /etc/nixos + ${self.keyedgit cfg.key}/bin/git pull --ff-only --verify-signatures + ${self.pinch}/bin/pinch update channels + ) + + ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch --no-build-output + ''; + }) ]; + + environment.systemPackages = [ pkgs.auto-upgrade ]; + systemd.services.nixos-upgrade = { description = "NixOS Upgrade"; restartIfChanged = false; @@ -58,7 +73,6 @@ in { gitMinimal gnutar gzip - pinch xz.bin ]; @@ -70,13 +84,7 @@ in { # intervene either to fix the problem or disable automatic updates. sleep 2h - ( - cd /etc/nixos - ${pkgs.keyedgit cfg.key}/bin/git pull --ff-only --verify-signatures - pinch update channels - ) - - ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch --no-build-output + ${pkgs.auto-upgrade}/bin/auto-upgrade ''; startAt = cfg.dates; -- 2.44.1