Merge pull request #285315 from jmbaur/sysupdate-fixes

nixos/sysupdate: allow lists in sysupdate config
2024-02-07 03:01:49 -05:00
parent d5917b14b3 514bfa6674
commit ee9becfdfb
2 changed files with 9 additions and 9 deletions
--- a/nixos/modules/system/boot/systemd/sysupdate.nix
+++ b/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -3,7 +3,7 @@
 let
  cfg = config.systemd.sysupdate;

-  format = pkgs.formats.ini { };
+  format = pkgs.formats.ini { listToValue = toString; };

  definitionsDirectory = utils.systemdUtils.lib.definitions
    "sysupdate.d"
@@ -79,7 +79,7 @@ in
          Source = {
            Type = "url-file";
            Path = "https://download.example.com/";
-            MatchPattern = "nixos_@v.efi.xz";
+            MatchPattern = [ "nixos_@v+@l-@d.efi" "nixos_@v+@l.efi" "nixos_@v.efi" ];
          };

          Target = {