From 403827be4624e26b50f0180f16b3819b3c0b9816 Mon Sep 17 00:00:00 2001
From: Adam Sutch <adamsutch@gmail.com>
Date: Sat, 15 Feb 2025 18:38:07 -0500
Subject: [PATCH 1/2] incus.ui: 0.7 -> incus-0.14.6

fix(incus-ui): update version format and tag reference
---
 pkgs/by-name/in/incus/ui.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix
index 49ae00c05165..5e7dcbed8e80 100644
--- a/pkgs/by-name/in/incus/ui.nix
+++ b/pkgs/by-name/in/incus/ui.nix
@@ -12,32 +12,28 @@
 
 stdenv.mkDerivation rec {
   pname = "incus-ui";
-  version = "0.7";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
-    owner = "canonical";
-    repo = "lxd-ui";
-    rev = "refs/tags/${version}";
-    hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4=";
+    owner = "zabbly";
+    repo = "incus-ui-canonical";
+    tag = "incus-${version}";
+    hash = "sha256-An2mhIj3D2EdB1Bgnry1l2m6r/GIKTee4anSYNTq8B8=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4=";
+    hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";
   };
 
   zabbly = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus";
-    rev = "c83023587eb0e3b01c99ba26e63f757ac15c6f9c";
-    hash = "sha256-cWKp4ALrae6nEBLvWcOM1T+Aca7eHLwsRguH9aSb10Y=";
+    rev = "36714d7c38eb3cc3e4e821c7aed44e066e1e84ca";
+    hash = "sha256-H6gjXmwCv3oGXrzn1NENfgO3CWXMnmp94GdJv2Q8n0w=";
   };
 
   patchPhase = ''
-    for p in $zabbly/patches/ui-canonical*patch; do
-      echo "applying patch $p"
-      git apply -p1 "$p"
-    done
     sed -i -f "$zabbly/patches/ui-canonical-renames.sed" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
   '';
 
@@ -80,7 +76,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Web user interface for Incus, based on LXD webui";
-    homepage = "https://github.com/canonical/lxd-ui";
+    homepage = "https://github.com/zabbly/incus-ui-canonical";
     license = lib.licenses.gpl3;
     maintainers = lib.teams.lxc.members;
     platforms = lib.platforms.linux;

From ad53a8451f8083a82c1494f725a4149c0f57335c Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 16 Feb 2025 15:48:04 -0500
Subject: [PATCH 2/2] incus-ui-canonical: rename from incus.ui

---
 nixos/modules/virtualisation/incus.nix                     | 7 ++-----
 .../in/{incus/ui.nix => incus-ui-canonical/package.nix}    | 4 ++--
 pkgs/by-name/in/incus/generic.nix                          | 3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/by-name/in/{incus/ui.nix => incus-ui-canonical/package.nix} (94%)

diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 003d7dd9f702..76378ed90438 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -270,12 +270,9 @@ in
       };
 
       ui = {
-        enable = lib.mkEnableOption "(experimental) Incus UI";
+        enable = lib.mkEnableOption "Incus Web UI";
 
-        package = lib.mkPackageOption pkgs [
-          "incus"
-          "ui"
-        ] { };
+        package = lib.mkPackageOption pkgs [ "incus-ui-canonical" ] { };
       };
     };
   };
diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
similarity index 94%
rename from pkgs/by-name/in/incus/ui.nix
rename to pkgs/by-name/in/incus-ui-canonical/package.nix
index 5e7dcbed8e80..85db4d3e10ed 100644
--- a/pkgs/by-name/in/incus/ui.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "incus-ui";
+  pname = "incus-ui-canonical";
   version = "0.14.6";
 
   src = fetchFromGitHub {
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   passthru.tests.default = nixosTests.incus.ui;
 
   meta = {
-    description = "Web user interface for Incus, based on LXD webui";
+    description = "Web user interface for Incus";
     homepage = "https://github.com/zabbly/incus-ui-canonical";
     license = lib.licenses.gpl3;
     maintainers = lib.teams.lxc.members;
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
index 0954032da23c..be969c84e4a6 100644
--- a/pkgs/by-name/in/incus/generic.nix
+++ b/pkgs/by-name/in/incus/generic.nix
@@ -14,6 +14,7 @@
   fetchFromGitHub,
   acl,
   cowsql,
+  incus-ui-canonical,
   libcap,
   lxc,
   pkg-config,
@@ -126,7 +127,7 @@ buildGoModule rec {
 
     tests = if lts then nixosTests.incus-lts.all else nixosTests.incus.all;
 
-    ui = callPackage ./ui.nix { };
+    ui = lib.warnOnInstantiate "`incus.ui` renamed to `incus-ui-canonical`" incus-ui-canonical;
 
     updateScript = nix-update-script {
       extraArgs = nixUpdateExtraArgs;