Merge staging-next-24.11 into staging-24.11

NixOS · Dec 21, 2024 · fcc4949 · fcc4949
2 parents 36a904c + d7567e0
commit fcc4949
Show file tree

Hide file tree

Showing 30 changed files with 622 additions and 679 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -252,6 +252,8 @@
 
 - `grafana` has been updated to version 11.3. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
 
+- `matomo` 4.x reached end of life on December 19, 2024. It is recommended to upgrade to `matomo_5`.
+
 - `deno` has been updated to Deno 2, which has breaking changes.
   See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details.
 

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
@@ -81,34 +81,42 @@ let
     fdSize2MB = true;
   };
   ovmf-prefix = if pkgs.stdenv.hostPlatform.isAarch64 then "AAVMF" else "OVMF";
-  ovmf = pkgs.linkFarm "incus-ovmf" [
-    # 2MB must remain the default or existing VMs will fail to boot. New VMs will prefer 4MB
-    {
-      name = "OVMF_CODE.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_CODE.fd";
-    }
-    {
-      name = "OVMF_VARS.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-    {
-      name = "OVMF_VARS.ms.fd";
-      path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
+  ovmf = pkgs.linkFarm "incus-ovmf" (
+    [
+      # 2MB must remain the default or existing VMs will fail to boot. New VMs will prefer 4MB
+      {
+        name = "OVMF_CODE.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_CODE.fd";
+      }
+      {
+        name = "OVMF_VARS.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+      {
+        name = "OVMF_VARS.ms.fd";
+        path = "${OVMF2MB.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
 
-    {
-      name = "OVMF_CODE.4MB.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_CODE.fd";
-    }
-    {
-      name = "OVMF_VARS.4MB.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-    {
-      name = "OVMF_VARS.4MB.ms.fd";
-      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
-    }
-  ];
+      {
+        name = "OVMF_CODE.4MB.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_CODE.fd";
+      }
+      {
+        name = "OVMF_VARS.4MB.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+      {
+        name = "OVMF_VARS.4MB.ms.fd";
+        path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";
+      }
+    ]
+    ++ lib.optionals pkgs.stdenv.hostPlatform.isx86_64 [
+      {
+        name = "seabios.bin";
+        path = "${pkgs.seabios-qemu}/share/seabios/bios.bin";
+      }
+    ]
+  );
 
   environment = lib.mkMerge [
     {

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
@@ -464,8 +464,8 @@ in {
   iftop = handleTest ./iftop.nix {};
   immich = handleTest ./web-apps/immich.nix {};
   incron = handleTest ./incron.nix {};
-  incus = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; inherit (pkgs) incus; });
-  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit handleTestOn; });
+  incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; });
+  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { });
   influxdb = handleTest ./influxdb.nix {};
   influxdb2 = handleTest ./influxdb2.nix {};
   initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {};

diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix
diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix
@@ -1,29 +1,42 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../../.. { inherit system config; },
-  handleTestOn,
-  incus ? pkgs.incus-lts,
+  lts ? true,
+  ...
 }:
+let
+  incusTest = import ./incus-tests.nix;
+in
 {
-  container-legacy-init = import ./container.nix {
-    name = "container-legacy-init";
-    inherit incus system pkgs;
+  all = incusTest {
+    inherit lts;
+    allTests = true;
   };
-  container-systemd-init = import ./container.nix {
-    name = "container-systemd-init";
-    inherit incus system pkgs;
-    extra = {
-      boot.initrd.systemd.enable = true;
-    };
+
+  container = incusTest {
+    inherit lts;
+    instanceContainer = true;
   };
-  incusd-options = import ./incusd-options.nix { inherit incus system pkgs; };
-  lxd-to-incus = import ./lxd-to-incus.nix { inherit incus system pkgs; };
-  openvswitch = import ./openvswitch.nix { inherit incus system pkgs; };
-  socket-activated = import ./socket-activated.nix { inherit incus system pkgs; };
-  storage = import ./storage.nix { inherit incus system pkgs; };
-  ui = import ./ui.nix { inherit incus system pkgs; };
-  virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix {
-    inherit incus system pkgs;
+
+  lvm = incusTest {
+    inherit lts;
+    storageLvm = true;
+  };
+
+  lxd-to-incus = import ./lxd-to-incus.nix { };
+
+  openvswitch = incusTest {
+    inherit lts;
+    networkOvs = true;
+  };
+
+  ui = import ./ui.nix { };
+
+  virtual-machine = incusTest {
+    inherit lts;
+    instanceVm = true;
+  };
+
+  zfs = incusTest {
+    inherit lts;
+    storageLvm = true;
   };
 }