From 537298bb4c63b958b23290f201f84030321e7432 Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Sat, 1 Aug 2026 12:35:08 -0700
Subject: [PATCH 1/2] python3Packages.busylight-core: 2.2.0 -> 2.4.0

---
 .../python-modules/busylight-core/default.nix  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/busylight-core/default.nix b/pkgs/development/python-modules/busylight-core/default.nix
index be098b691e4f..173f676bb41b 100644
--- a/pkgs/development/python-modules/busylight-core/default.nix
+++ b/pkgs/development/python-modules/busylight-core/default.nix
@@ -12,21 +12,17 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "busylight-core";
-  version = "2.2.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JnyJny";
-    repo = "busylight-core";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-as2IvaxyMjGKPGlBmz1cntAhbpuW+f3INtnNIcwpWh8=";
+    repo = "busylight";
+    tag = "busylight-core/v${finalAttrs.version}";
+    hash = "sha256-m7ZxZkaWnkQV/KZ/xm3+uSfftL1V5Lxolx2lB63Mzyk=";
+    rootDir = "packages/busylight-core";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.7.19,<0.8" "uv_build"
-  '';
-
   build-system = [ uv-build ];
 
   dependencies = [
@@ -44,8 +40,8 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     description = "Library for interacting programmatically with USB-connected LED lights";
-    homepage = "https://github.com/JnyJny/busylight-core";
-    changelog = "https://github.com/JnyJny/busylight-core/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/JnyJny/busylight";
+    changelog = "https://github.com/JnyJny/busylight/blob/${finalAttrs.src.tag}/${finalAttrs.src.rootDir}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };

From 98e7cc5ca7242e1d274be1dd9b17613d0e8e48d5 Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Sat, 1 Aug 2026 12:35:56 -0700
Subject: [PATCH 2/2] python3Packages.busylight-for-humans: 0.48.0 -> 1.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves incompatibility with fastapi ≥0.137:

   FAILED tests/test_api_structure.py::TestAPIStructure::test_route_counts - AssertionError: assert 4 > 40
---
 .../busylight-for-humans/default.nix            | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix
index 9950b2edc9ad..8d2ed0b0f191 100644
--- a/pkgs/development/python-modules/busylight-for-humans/default.nix
+++ b/pkgs/development/python-modules/busylight-for-humans/default.nix
@@ -5,7 +5,6 @@
   busylight-core,
   fastapi,
   fetchFromGitHub,
-  hatchling,
   hidapi,
   httpx,
   loguru,
@@ -14,26 +13,27 @@
   pytestCheckHook,
   typer,
   udevCheckHook,
+  uv-build,
   uvicorn,
   webcolors,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "busylight-for-humans";
-  version = "0.48.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JnyJny";
     repo = "busylight";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-5sQXW55P/iWhDWY6bGzN8IrWCJyrSvu2ObtIOolo2X0=";
+    tag = "busylight-cli/v${finalAttrs.version}";
+    hash = "sha256-h+YPrcf32SgzdQDYCeQlh4enzsXfsHr470W3tiFBO7g=";
+    rootDir = "packages/busylight";
   };
 
-  build-system = [ hatchling ];
+  build-system = [ uv-build ];
 
   dependencies = [
-    bitvector-for-humans
     busylight-core
     hidapi
     loguru
@@ -53,13 +53,10 @@ buildPythonPackage (finalAttrs: {
   nativeCheckInputs = [
     httpx
     pytestCheckHook
-    pytest-mock
     udevCheckHook
   ]
   ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
-  disabledTestPaths = [ "tests/test_pydantic_models.py" ];
-
   pythonImportsCheck = [ "busylight" ];
 
   postInstall = ''
@@ -70,7 +67,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Control USB connected presence lights from multiple vendors via the command-line or web API";
     homepage = "https://github.com/JnyJny/busylight";
-    changelog = "https://github.com/JnyJny/busylight/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/JnyJny/busylight/blob/${finalAttrs.src.tag}/${finalAttrs.src.rootDir}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       das_j