From 2521830bbdd251d9b3b6d89f52c001988cccdb69 Mon Sep 17 00:00:00 2001
From: cmspam <charlesmillerspam@gmail.com>
Date: Sat, 9 Mar 2024 21:58:06 +0900
Subject: [PATCH 1/2] Added incus-specific patches to fix branding and API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Used sed command to replace various 'LXD' branding with 'Incus' branding, and

1. Replaced all occurrences of "LXD" with "Incus"
2. Replaced all occurrences of "devlxd" with "guestapi"
3. Replaced "dev/lxd" with "dev/incus"
4. Replaced "lxd_" with "incus_"
5. Replaced occurrences of ""lxd"" with ""incus""

Apart from the branding, this fixes incompatible naming in the web UI.

These are taken directly from the patches used by Incus maintainer Stéphane Grober, in his repository zabbly/incus
---
 pkgs/by-name/in/incus/ui.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix
index 2aefb2c640f9..ebf052ed8782 100644
--- a/pkgs/by-name/in/incus/ui.nix
+++ b/pkgs/by-name/in/incus/ui.nix
@@ -22,5 +22,11 @@ lxd.ui.overrideAttrs(prev: rec {
       echo "applying patch $p"
       git apply -p1 "$p"
     done
+    sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+    sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+    sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+    sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+    sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+
   '';
 })

From 8a274e0c18b69e9015de3893282b6590c531dff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 9 Mar 2024 17:21:55 +0100
Subject: [PATCH 2/2] nixosTests.incus.*: enable nftables to fix tests

---
 nixos/tests/incus/container.nix        | 1 +
 nixos/tests/incus/lxd-to-incus.nix     | 1 +
 nixos/tests/incus/preseed.nix          | 1 +
 nixos/tests/incus/socket-activated.nix | 1 +
 nixos/tests/incus/ui.nix               | 1 +
 nixos/tests/incus/virtual-machine.nix  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix
index eb00429e53fe..9260f70da98c 100644
--- a/nixos/tests/incus/container.nix
+++ b/nixos/tests/incus/container.nix
@@ -29,6 +29,7 @@ in
 
       incus.enable = true;
     };
+    networking.nftables.enable = true;
   };
 
   testScript = ''
diff --git a/nixos/tests/incus/lxd-to-incus.nix b/nixos/tests/incus/lxd-to-incus.nix
index c0fc98c224df..262f63c0f26f 100644
--- a/nixos/tests/incus/lxd-to-incus.nix
+++ b/nixos/tests/incus/lxd-to-incus.nix
@@ -67,6 +67,7 @@ import ../make-test-python.nix (
 
           incus.enable = true;
         };
+        networking.nftables.enable = true;
       };
 
     testScript = ''
diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix
index a488d71f3c92..f2d928115f3e 100644
--- a/nixos/tests/incus/preseed.nix
+++ b/nixos/tests/incus/preseed.nix
@@ -48,6 +48,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
         ];
       };
     };
+    networking.nftables.enable = true;
   };
 
   testScript = ''
diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix
index fca536b7054f..59caf1090fbd 100644
--- a/nixos/tests/incus/socket-activated.nix
+++ b/nixos/tests/incus/socket-activated.nix
@@ -12,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
       incus.enable = true;
       incus.socketActivation = true;
     };
+    networking.nftables.enable = true;
   };
 
   testScript = ''
diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix
index 24ce1217d8df..837eb14844ce 100644
--- a/nixos/tests/incus/ui.nix
+++ b/nixos/tests/incus/ui.nix
@@ -10,6 +10,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: {
       incus.enable = true;
       incus.ui.enable = true;
     };
+    networking.nftables.enable = true;
 
     environment.systemPackages =
       let
diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix
index c76e4f448f2f..ab378c7b9490 100644
--- a/nixos/tests/incus/virtual-machine.nix
+++ b/nixos/tests/incus/virtual-machine.nix
@@ -32,6 +32,7 @@ in
 
       incus.enable = true;
     };
+    networking.nftables.enable = true;
   };
 
   testScript = ''