incus.ui: 0.7 -> incus-0.14.6, rename to incus-ui-canonical (#382440)

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" ] { };
       };
     };
   };

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

@@ -11,33 +11,29 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "incus-ui";
-  version = "0.7";
+  pname = "incus-ui-canonical";
+  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*
   '';
 
@@ -79,8 +75,8 @@ stdenv.mkDerivation rec {
   passthru.tests.default = nixosTests.incus.ui;
 
   meta = {
-    description = "Web user interface for Incus, based on LXD webui";
-    homepage = "https://github.com/canonical/lxd-ui";
+    description = "Web user interface for Incus";
+    homepage = "https://github.com/zabbly/incus-ui-canonical";
     license = lib.licenses.gpl3;
     maintainers = lib.teams.lxc.members;
     platforms = lib.platforms.linux;

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;