Merge master into staging-nixos

nixos/modules/virtualisation/incus.nix

@@ -93,6 +93,9 @@ let
     ]
     ++ lib.optionals nvidiaEnabled [
       libnvidia-container
+    ]
+    ++ lib.optionals cfg.storage.truenas.enable [
+      truenas-incus-ctl
     ];
 
   # https://github.com/lxc/incus/blob/cff35a29ee3d7a2af1f937cbb6cf23776941854b/internal/server/instance/drivers/driver_qemu.go#L123
@@ -284,6 +287,8 @@ in
         '';
       };
 
+      storage.truenas.enable = lib.mkEnableOption "TrueNAS storage driver support";
+
       ui = {
         enable = lib.mkEnableOption "Incus Web UI";
 
@@ -314,6 +319,10 @@ in
           );
         message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`";
       }
+      {
+        assertion = cfg.storage.truenas.enable -> config.services.openiscsi.enable;
+        messages = "`virtualisation.incus.storage.truenas.enable` requires `services.openiscsi.enable`";
+      }
     ];
 
     # https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md
@@ -346,6 +355,9 @@ in
 
       # gui console support
       pkgs.spice-gtk
+    ]
+    ++ lib.optionals cfg.storage.truenas.enable [
+      pkgs.truenas-incus-ctl
     ];
 
     # Note: the following options are also declared in virtualisation.lxc, but

nixos/tests/playwright-python.nix

@@ -29,7 +29,7 @@
               "firefox": {},
               "webkit": {}
             }
-            needle = re.compile("Nix.*Reference Manual")
+            needle = re.compile("Nix.* Manual")
             if len(sys.argv) != 3 or sys.argv[1] not in browsers.keys():
                 print(f"usage: {sys.argv[0]} [{'|'.join(browsers.keys())}] <url>")
                 sys.exit(1)

nixos/tests/scx/default.nix

@@ -13,16 +13,19 @@
     specialisation = {
       beerland.configuration.services.scx.scheduler = "scx_beerland";
       bpfland.configuration.services.scx.scheduler = "scx_bpfland";
+      cake.configuration.services.scx.scheduler = "scx_cake";
+      chaos.configuration.services.scx.scheduler = "scx_chaos";
       cosmos.configuration.services.scx.scheduler = "scx_cosmos";
       flash.configuration.services.scx.scheduler = "scx_flash";
-      flatcg.configuration.services.scx.scheduler = "scx_flatcg";
+      flow.configuration.services.scx.scheduler = "scx_flow";
+      forge.configuration.services.scx.scheduler = "scx_forge";
       lavd.configuration.services.scx.scheduler = "scx_lavd";
-      nest.configuration.services.scx.scheduler = "scx_nest";
       p2dq.configuration.services.scx.scheduler = "scx_p2dq";
+      pandemonium.configuration.services.scx.scheduler = "scx_pandemonium";
       rlfifo.configuration.services.scx.scheduler = "scx_rlfifo";
       rustland.configuration.services.scx.scheduler = "scx_rustland";
       rusty.configuration.services.scx.scheduler = "scx_rusty";
-      simple.configuration.services.scx.scheduler = "scx_simple";
+      tickless.configuration.services.scx.scheduler = "scx_tickless";
     };
   };
 
@@ -30,16 +33,19 @@
     specialisation = [
       "beerland",
       "bpfland",
+      "cake",
+      "chaos",
       "cosmos",
       "flash",
-      "flatcg",
+      "flow",
+      "forge",
       "lavd",
-      "nest",
       "p2dq",
+      "pandemonium",
       "rlfifo",
       "rustland",
       "rusty",
-      "simple"
+      "tickless",
     ]
 
     def activate_specialisation(name: str):