summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-10-23 17:24:17 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-10-23 17:56:39 +0200
commit645ff13a4be67718b624c5b15f316922399cc3dd (patch)
tree9176ae3bbc070cf1ec82b36a3ff27b1b98c75c93
parent0bb07f6d7b485975af7fc96f09ebf1582fcde508 (diff)
downloadnixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar.gz
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar.bz2
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar.lz
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar.xz
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.tar.zst
nixpkgs-645ff13a4be67718b624c5b15f316922399cc3dd.zip
nixos autoUpgrade: fix use of startAt
`startAt = ""` as in `startAt = optionalString false ...` results
in an invalid timer unit (due to "" being promoted to a singleton
list and not filtered out).

Ref: c9941c4b5ef7acc1cb8d734acb383410d99c01ba
-rw-r--r--nixos/modules/installer/tools/auto-upgrade.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index b21b80c666a..dfb43d1a1db 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -84,7 +84,7 @@ let cfg = config.system.autoUpgrade; in
         ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}
       '';
 
-      startAt = optionalString cfg.enable cfg.dates;
+      startAt = optional cfg.enable cfg.dates;
     };
 
   };