From 91a3a6a29b689d447ed05f4bcde028593e94af0c Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Mon, 1 Apr 2024 23:25:42 -0400
Subject: [PATCH] lxd-ui: move to standalone by-name and format

---
 nixos/modules/virtualisation/lxd.nix            |  2 +-
 .../ui.nix => by-name/lx/lxd-ui/package.nix}    | 17 +++++++++--------
 pkgs/tools/admin/lxd/default.nix                |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{tools/admin/lxd/ui.nix => by-name/lx/lxd-ui/package.nix} (92%)

diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index e0d61b175494..48d7af434eec 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -139,7 +139,7 @@ in {
       ui = {
         enable = lib.mkEnableOption (lib.mdDoc "(experimental) LXD UI");
 
-        package = lib.mkPackageOption pkgs [ "lxd-unwrapped" "ui" ] { };
+        package = lib.mkPackageOption pkgs [ "lxd-ui" ] { };
       };
     };
   };
diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/by-name/lx/lxd-ui/package.nix
similarity index 92%
rename from pkgs/tools/admin/lxd/ui.nix
rename to pkgs/by-name/lx/lxd-ui/package.nix
index 138e99d26890..817636666275 100644
--- a/pkgs/tools/admin/lxd/ui.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchYarnDeps
-, nodejs
-, prefetch-yarn-deps
-, yarn
-, nixosTests
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  nodejs,
+  prefetch-yarn-deps,
+  yarn,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index d66fd7cb3a45..1ac34c7a1be9 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -77,7 +77,6 @@ buildGoModule rec {
 
   passthru.tests.lxd = nixosTests.lxd;
   passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
-  passthru.ui = callPackage ./ui.nix { };
   passthru.updateScript = gitUpdater {
     url = "https://github.com/canonical/lxd.git";
     rev-prefix = "lxd-";