From aed841d32eeeaa3a95a93a5c2aa67316504c7669 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 26 Mar 2026 11:42:16 -0500 Subject: [PATCH] hass --- packages/homeassistant/ha-anycubic/default.nix | 9 +++------ packages/homeassistant/ha-bambulab/default.nix | 4 ++-- packages/homeassistant/ha-bedjet/default.nix | 4 ++-- packages/homeassistant/ha-gehome/default.nix | 13 +++++-------- packages/homeassistant/ha-govee/default.nix | 4 ++-- packages/homeassistant/ha-icloud3/default.nix | 4 ++-- packages/homeassistant/ha-local-llm/default.nix | 9 ++------- .../homeassistant/ha-mail-and-packages/default.nix | 4 ++-- packages/homeassistant/ha-openhasp/default.nix | 8 +++----- packages/homeassistant/ha-overseerr/default.nix | 4 +--- packages/homeassistant/ha-wyzeapi/default.nix | 10 ++-------- packages/python/magicattr/default.nix | 6 +++--- packages/python/pyoverseerr/default.nix | 6 +++--- packages/python/wyzeapy/default.nix | 8 ++++---- packages/system/uart-wifi/default.nix | 6 +++--- 15 files changed, 39 insertions(+), 60 deletions(-) diff --git a/packages/homeassistant/ha-anycubic/default.nix b/packages/homeassistant/ha-anycubic/default.nix index bf242b9..d0a9720 100644 --- a/packages/homeassistant/ha-anycubic/default.nix +++ b/packages/homeassistant/ha-anycubic/default.nix @@ -1,5 +1,6 @@ { buildHomeAssistantComponent, + fetchFromGitHub, pkgs, namespace, ... @@ -9,18 +10,14 @@ buildHomeAssistantComponent rec { domain = "anycubic_wifi"; version = "HACS-10"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = owner; repo = "anycubic-homeassistant"; rev = version; hash = "sha256-TfZadwgdEJR11MaL+nfIgEYld3trWg3v6lOHSoxQ98Q="; }; - # PYTHONPATH = [ "${src}/uart-wifi" ]; - - nativeBuildInputs = with pkgs.${namespace}; [ - uart-wifi - ]; + nativeBuildInputs = [ pkgs.${namespace}.uart-wifi ]; meta = { changelog = "https://github.com/adamoutler/anycubic-homeassistant/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index 4a534c6..8621d45 100644 --- a/packages/homeassistant/ha-bambulab/default.nix +++ b/packages/homeassistant/ha-bambulab/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, - python3Packages, fetchFromGitHub, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-lKKfPWWcri2OUM9nkdY2iltvIaoFhnUP4HGBGDUnEww="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ beautifulsoup4 ]; diff --git a/packages/homeassistant/ha-bedjet/default.nix b/packages/homeassistant/ha-bedjet/default.nix index 275c9ab..e20fe60 100644 --- a/packages/homeassistant/ha-bedjet/default.nix +++ b/packages/homeassistant/ha-bedjet/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, - python3Packages, fetchFromGitHub, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-FAuL3A8wtGwt+GM180A7wMlIvJvGoLmxNLCtnomxV3o="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ beautifulsoup4 ]; diff --git a/packages/homeassistant/ha-gehome/default.nix b/packages/homeassistant/ha-gehome/default.nix index e2313ee..c294696 100644 --- a/packages/homeassistant/ha-gehome/default.nix +++ b/packages/homeassistant/ha-gehome/default.nix @@ -1,9 +1,9 @@ { buildHomeAssistantComponent, fetchFromGitHub, - python3Packages, - namespace, + home-assistant, pkgs, + namespace, ... }: buildHomeAssistantComponent rec { @@ -19,15 +19,12 @@ buildHomeAssistantComponent rec { }; nativeBuildInputs = - with python3Packages; + with home-assistant.python.pkgs; [ - # gehomesdk + gehomesdk slixmpp ] - ++ (with pkgs.${namespace}; [ - gehomesdk - magicattr - ]); + ++ [ pkgs.${namespace}.magicattr ]; meta = { changelog = "https://github.com/simbaja/ha_gehome/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-govee/default.nix b/packages/homeassistant/ha-govee/default.nix index 78f88c0..dc48f8a 100644 --- a/packages/homeassistant/ha-govee/default.nix +++ b/packages/homeassistant/ha-govee/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, - python3Packages, fetchFromGitHub, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-3SnYjjQU2qRBcKs40bCpN75Ad3HqMcn/hRj1faSSeHw="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ dacite ]; diff --git a/packages/homeassistant/ha-icloud3/default.nix b/packages/homeassistant/ha-icloud3/default.nix index 4c2e209..7b11589 100644 --- a/packages/homeassistant/ha-icloud3/default.nix +++ b/packages/homeassistant/ha-icloud3/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, fetchFromGitHub, - python3Packages, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-B63iY4OC00PGXx/3aq/rkiO0xK11hXz66KaglwmgxIk="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ fido2 srp ]; diff --git a/packages/homeassistant/ha-local-llm/default.nix b/packages/homeassistant/ha-local-llm/default.nix index 846173b..45e9f34 100644 --- a/packages/homeassistant/ha-local-llm/default.nix +++ b/packages/homeassistant/ha-local-llm/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, - python3Packages, fetchFromGitHub, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,18 +16,13 @@ buildHomeAssistantComponent rec { hash = "sha256-QmpyqNRhmnqFNiKPHm8GKuvZhbuYWDLck3eFC9MlIKQ="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ anthropic huggingface-hub ollama webcolors ]; - # postPatch = '' - # substituteInPlace custom_components/llama_conversation/manifest.json \ - # --replace-fail '"ollama>=0.5.1"' '"ollama"' - # ''; - meta = { changelog = "https://github.com/acon96/home-llm/releases/tag/${version}"; description = "This project provides the required \"glue\" components to control your Home Assistant installation with a completely local Large Language Model acting as a personal assistant. The goal is to provide a drop in solution to be used as a \"conversation agent\" component by Home Assistant. The 2 main pieces of this solution are the Home LLM model and Local LLM Conversation integration."; diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index d7b85ec..6efec92 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -1,7 +1,7 @@ { buildHomeAssistantComponent, fetchFromGitHub, - python3Packages, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-w+7cC/jV+6bQM1aEPlO90Z1o9CcjmPvjNDSG9CduFFw="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with home-assistant.python.pkgs; [ beautifulsoup4 dateparser pillow diff --git a/packages/homeassistant/ha-openhasp/default.nix b/packages/homeassistant/ha-openhasp/default.nix index ccec107..f574a0d 100644 --- a/packages/homeassistant/ha-openhasp/default.nix +++ b/packages/homeassistant/ha-openhasp/default.nix @@ -1,8 +1,7 @@ { buildHomeAssistantComponent, fetchFromGitHub, - pkgs, - # namespace, + home-assistant, ... }: buildHomeAssistantComponent rec { @@ -17,9 +16,8 @@ buildHomeAssistantComponent rec { hash = "sha256-5h1EqwpnsmWexqB3J/X4OcN9bfBYUxGxLF1Hrmoi5LY="; }; - nativeBuildInputs = with pkgs.python3Packages; [ - jsonschema - ]; + # Use HA's own Python (3.14) packages to satisfy the manifest check for jsonschema + nativeBuildInputs = [ home-assistant.python.pkgs.jsonschema ]; meta = { changelog = "https://github.com/HASwitchPlate/openHASP-custom-component/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-overseerr/default.nix b/packages/homeassistant/ha-overseerr/default.nix index cfa841c..6c8cf1f 100644 --- a/packages/homeassistant/ha-overseerr/default.nix +++ b/packages/homeassistant/ha-overseerr/default.nix @@ -17,9 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-UvUowCgfay9aRV+iC/AQ9vvJzhGZbH+/1kVjxPFBKcI="; }; - nativeBuildInputs = with pkgs.${namespace}; [ - pyoverseerr - ]; + nativeBuildInputs = [ pkgs.${namespace}.pyoverseerr ]; meta = { changelog = "https://github.com/vaparr/ha-overseerr/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-wyzeapi/default.nix b/packages/homeassistant/ha-wyzeapi/default.nix index c53d5b7..4a0aa79 100644 --- a/packages/homeassistant/ha-wyzeapi/default.nix +++ b/packages/homeassistant/ha-wyzeapi/default.nix @@ -17,14 +17,8 @@ buildHomeAssistantComponent rec { hash = "sha256-4i5Ne3LYV7DXn6F6e5MCVZhIdDYR7fe3tT2GeSmYb/k="; }; - nativeBuildInputs = with pkgs.${namespace}; [ - wyzeapy - ]; - - postPatch = '' - substituteInPlace custom_components/wyzeapi/manifest.json \ - --replace '"wyzeapy>=0.5.28,<0.6"' '"wyzeapy>=0.5.27,<0.6"' - ''; + # wyzeapy must be built against HA's Python; pkgs.mjallen.wyzeapy uses home-assistant.python + dependencies = [ pkgs.${namespace}.wyzeapy ]; meta = { changelog = "https://github.com/SecKatie/ha-wyzeapi/releases/tag/${version}"; diff --git a/packages/python/magicattr/default.nix b/packages/python/magicattr/default.nix index b569ceb..dd93942 100644 --- a/packages/python/magicattr/default.nix +++ b/packages/python/magicattr/default.nix @@ -1,10 +1,10 @@ { - python3Packages, fetchFromGitHub, + home-assistant, ... }: -python3Packages.buildPythonPackage rec { +home-assistant.python.pkgs.buildPythonPackage rec { pname = "magicattr"; version = "0.1.6"; format = "setuptools"; @@ -16,6 +16,6 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-FJtWU5AuunZbdlndGdfD1c9/0s7oRdoTi202pWjuAd8="; }; - buildInputs = with python3Packages; [ setuptools ]; + build-system = [ home-assistant.python.pkgs.setuptools ]; doCheck = false; } diff --git a/packages/python/pyoverseerr/default.nix b/packages/python/pyoverseerr/default.nix index 04c3245..3f2023c 100644 --- a/packages/python/pyoverseerr/default.nix +++ b/packages/python/pyoverseerr/default.nix @@ -1,5 +1,5 @@ -{ python3Packages, fetchFromGitHub, ... }: -python3Packages.buildPythonPackage rec { +{ fetchFromGitHub, home-assistant, ... }: +home-assistant.python.pkgs.buildPythonPackage rec { pname = "pyoverseerr"; version = "0.1.40"; format = "setuptools"; @@ -11,6 +11,6 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-sWYe6EV/IO/tGGXcnKiebb47eidIj0xnM/aZUfdZXyY="; }; - buildInputs = with python3Packages; [ setuptools ]; + build-system = [ home-assistant.python.pkgs.setuptools ]; doCheck = false; # no tests in the PyPI tarball } diff --git a/packages/python/wyzeapy/default.nix b/packages/python/wyzeapy/default.nix index c6fd7a5..c28891e 100644 --- a/packages/python/wyzeapy/default.nix +++ b/packages/python/wyzeapy/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, python3Packages, ... }: -python3Packages.buildPythonPackage rec { +{ fetchFromGitHub, home-assistant, ... }: +home-assistant.python.pkgs.buildPythonPackage rec { pname = "wyzeapy"; version = "0.5.31"; format = "pyproject"; @@ -11,12 +11,12 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-KDCd1G5Tj0YWM2WA3DJK9rTf1rMzz4qBSUl8FOUbvdM="; }; - buildInputs = with python3Packages; [ + build-system = with home-assistant.python.pkgs; [ poetry-core hatchling ]; - nativeBuildInputs = with python3Packages; [ + dependencies = with home-assistant.python.pkgs; [ aiodns aiohttp pycryptodome diff --git a/packages/system/uart-wifi/default.nix b/packages/system/uart-wifi/default.nix index dd5d266..ceb7085 100644 --- a/packages/system/uart-wifi/default.nix +++ b/packages/system/uart-wifi/default.nix @@ -1,5 +1,5 @@ -{ python3Packages, fetchPypi, ... }: -python3Packages.buildPythonPackage rec { +{ fetchPypi, home-assistant, ... }: +home-assistant.python.pkgs.buildPythonPackage rec { pname = "uart-wifi"; version = "0.2.1"; format = "pyproject"; @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-yquZ5V8f+EqetCf0nc9WlhHhnHkOASYRuYvqEIMc5HI="; }; - buildInputs = with python3Packages; [ setuptools ]; + build-system = [ home-assistant.python.pkgs.setuptools ]; doCheck = false; # no tests in the PyPI tarball }