From d42ba49cbf1764169de0f27212cfc9955f12b96b Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 12 Jul 2024 14:25:44 -0400
Subject: [PATCH 1/4] incus: 6.2.0 -> 6.3.0

---
 pkgs/by-name/in/incus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index e5249ac1d48f..3cc8f463b7a3 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY=";
-  version = "6.2.0";
-  vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA=";
+  hash = "sha256-qRx2l677OAo8or/form1fTgL3vjM/kz3RA/8umkAP80=";
+  version = "6.3.0";
+  vendorHash = "sha256-VlJyq+PzToBicKCF3EMqzDsnIWuPhbk4JS4ASyhfiss=";
   patches = [ ];
 }

From c2a12db1a456a4b2a7b85a92143d26fda794f4e2 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 12 Jul 2024 16:33:52 -0400
Subject: [PATCH 2/4] nixos/incus: add skopeo and umoci

---
 nixos/modules/virtualisation/incus.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 2b69a7a07658..8e26e6c77dd1 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -44,12 +44,14 @@ let
         qemu-utils
         qemu_kvm
         rsync
+        skopeo
         squashfs-tools-ng
         squashfsTools
         sshfs
         swtpm
         systemd
         thin-provisioning-tools
+        umoci
         util-linux
         virtiofsd
         xdelta

From 8923ec72b511cf2dbb91623d189de3ad796b0216 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sun, 14 Jul 2024 23:33:07 -0400
Subject: [PATCH 3/4] lxcfs: lxc.mount.hook: add coreutils to PATH

---
 pkgs/by-name/lx/lxcfs/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 6105b6ecd6a6..db006cea566d 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -12,6 +12,7 @@
   pkg-config,
   python3,
   util-linux,
+  coreutils,
 }:
 
 stdenv.mkDerivation rec {
@@ -51,8 +52,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # `mount` hook requires access to the `mount` command from `util-linux`:
-    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin"
+    # `mount` hook requires access to the `mount` command from `util-linux` and `readlink` from `coreutils`:
+    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : ${lib.makeBinPath [ coreutils util-linux ]}
   '';
 
   postFixup = ''

From 856651fda8be67aeb8fb843a9ca9a1bcf6c14f41 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 15 Jul 2024 12:10:17 -0400
Subject: [PATCH 4/4] nixos/incus: INCUS_OVMF_PATH -> INCUS_EDK2_PATH

---
 nixos/modules/virtualisation/incus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 8e26e6c77dd1..8cb42adc0368 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -111,7 +111,7 @@ let
   environment = lib.mkMerge [
     {
       INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
-      INCUS_OVMF_PATH = ovmf;
+      INCUS_EDK2_PATH = ovmf;
       INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";
       PATH = lib.mkForce serverBinPath;
     }