[Backport release-24.11] incus: 6.8.0 -> 6.9.0

nixos/tests/incus/incus-tests.nix

@@ -244,22 +244,22 @@ import ../make-test-python.nix (
 
             with subtest("container CPU limits can be managed"):
                 set_config(f"container-{variant}1", "limits.cpu 1", restart=True)
-                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=15)
+                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90)
 
 
             with subtest("container CPU limits can be hotplug changed"):
                 set_config(f"container-{variant}1", "limits.cpu 2")
-                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=15)
+                wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90)
 
 
             with subtest("container memory limits can be managed"):
                 set_config(f"container-{variant}1", "limits.memory 128MB", restart=True)
-                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=15)
+                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90)
 
 
             with subtest("container memory limits can be hotplug changed"):
                 set_config(f"container-{variant}1", "limits.memory 256MB")
-                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=15)
+                wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90)
 
 
             with subtest("container software tpm can be configured"):
@@ -373,7 +373,7 @@ import ../make-test-python.nix (
 
             with subtest("virtual-machine CPU limits can be hotplug changed"):
                 set_config(f"vm-{variant}1", "limits.cpu 2")
-                wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=15)
+                wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90)
 
 
             with subtest("virtual-machine can successfully restart"):

pkgs/by-name/in/incus/generic.nix

@@ -2,7 +2,7 @@
   hash,
   lts ? false,
   patches ? [ ],
-  updateScriptArgs ? "",
+  nixUpdateExtraArgs ? [ ],
   vendorHash,
   version,
 }:
@@ -12,7 +12,6 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  writeScript,
   acl,
   cowsql,
   libcap,
@@ -21,6 +20,7 @@
   sqlite,
   udev,
   installShellFiles,
+  nix-update-script,
   nixosTests,
 }:
 
@@ -128,9 +128,9 @@ buildGoModule rec {
 
     ui = callPackage ./ui.nix { };
 
-    updateScript = writeScript "ovs-update.py" ''
-      ${./update.py} ${updateScriptArgs}
-    '';
+    updateScript = nix-update-script {
+      extraArgs = nixUpdateExtraArgs;
+    };
   };
 
   meta = {

pkgs/by-name/in/incus/lts.nix

@@ -8,5 +8,8 @@ import ./generic.nix {
     ./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
   ];
   lts = true;
-  updateScriptArgs = "--lts --regex '6.0.*'";
+  nixUpdateExtraArgs = [
+    "--version-regex=^v(6\\.0\\.[0-9]+)$"
+    "--override-filename=pkgs/by-name/in/incus/lts.nix"
+  ];
 }

pkgs/by-name/in/incus/package.nix

@@ -1,6 +1,9 @@
 import ./generic.nix {
-  hash = "sha256-Ir+cT+2xA+L4kBXhwA0XXE/D8zjMPGYiwW0VrEdobZ4=";
-  version = "6.8.0";
-  vendorHash = "sha256-CDLq41AB2Y9nYlTuXZaAOgwXIin9CbqSXCFoigsc14A=";
+  hash = "sha256-bi++GJLLYlX8JZwmxx4S2EGALuwVOGW4G7u2Nv6s26k=";
+  version = "6.9.0";
+  vendorHash = "sha256-aYQOKO5RMPqChV6hXPBfSLKdfCuS+BFVmpakJX7swKg=";
   patches = [ ];
+  nixUpdateExtraArgs = [
+    "--override-filename=pkgs/by-name/in/incus/package.nix"
+  ];
 }