From add39956f7199893020164ad34119ec2f16225e2 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 27 Mar 2026 09:05:31 -0500 Subject: [PATCH] hass --- .../services/music-assistant/default.nix | 2 +- overlays/homeassistant/default.nix | 15 +++++++++++++++ overlays/radios/default.nix | 4 ---- packages/homeassistant/ha-bambulab/default.nix | 6 +++--- packages/homeassistant/ha-gehome/default.nix | 16 +++++++++------- .../ha-mail-and-packages/default.nix | 11 ++++++++--- packages/python/gehomesdk/default.nix | 12 +++++------- 7 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 overlays/homeassistant/default.nix diff --git a/modules/nixos/homeassistant/services/music-assistant/default.nix b/modules/nixos/homeassistant/services/music-assistant/default.nix index cb5457e..7d46c78 100644 --- a/modules/nixos/homeassistant/services/music-assistant/default.nix +++ b/modules/nixos/homeassistant/services/music-assistant/default.nix @@ -12,7 +12,7 @@ in config = mkIf cfg.enable { services = { music-assistant = { - enable = true; + enable = false; providers = [ # "airplay" # music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1. "apple_music" diff --git a/overlays/homeassistant/default.nix b/overlays/homeassistant/default.nix new file mode 100644 index 0000000..45966e6 --- /dev/null +++ b/overlays/homeassistant/default.nix @@ -0,0 +1,15 @@ +{ ... }: +final: prev: { + home-assistant = prev.home-assistant.override { + packageOverrides = _self: super: { + psnawp = super.psnawp.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ super.pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "pycountry" ]; + }); + radios = super.radios.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ super.pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "pycountry" ]; + }); + }; + }; +} diff --git a/overlays/radios/default.nix b/overlays/radios/default.nix index 3427693..3422add 100644 --- a/overlays/radios/default.nix +++ b/overlays/radios/default.nix @@ -6,10 +6,6 @@ final: prev: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pyPrev.pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pycountry" ]; }); - psnawp = pyPrev.psnawp.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pyPrev.pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "pycountry" ]; - }); }; }; python3Packages = final.python3.pkgs; diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index 8621d45..450d878 100644 --- a/packages/homeassistant/ha-bambulab/default.nix +++ b/packages/homeassistant/ha-bambulab/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "greghesp"; domain = "bambu_lab"; - version = "v2.2.20"; + version = "v2.2.21"; src = fetchFromGitHub { owner = owner; repo = "ha-bambulab"; - rev = version; - hash = "sha256-lKKfPWWcri2OUM9nkdY2iltvIaoFhnUP4HGBGDUnEww="; + tag = version; + hash = "sha256-56aAJAsmn+PzLZijFQ9DbTfHSrbeNk+OM/ibu32UHtg="; }; nativeBuildInputs = with home-assistant.python.pkgs; [ diff --git a/packages/homeassistant/ha-gehome/default.nix b/packages/homeassistant/ha-gehome/default.nix index c294696..a4e36cd 100644 --- a/packages/homeassistant/ha-gehome/default.nix +++ b/packages/homeassistant/ha-gehome/default.nix @@ -18,13 +18,15 @@ buildHomeAssistantComponent rec { hash = "sha256-7c2GfTagNsIsSiT/sCqSV+BZZJMcvlsecDD+ZDZx9BA="; }; - nativeBuildInputs = - with home-assistant.python.pkgs; - [ - gehomesdk - slixmpp - ] - ++ [ pkgs.${namespace}.magicattr ]; + # gehomesdk and magicattr must be built against HA's Python + dependencies = with pkgs.${namespace}; [ + gehomesdk + magicattr + ]; + + nativeBuildInputs = with home-assistant.python.pkgs; [ + slixmpp + ]; meta = { changelog = "https://github.com/simbaja/ha_gehome/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index 6efec92..3d9bc6d 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -7,21 +7,26 @@ buildHomeAssistantComponent rec { owner = "moralmunky"; domain = "mail_and_packages"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = owner; repo = "Home-Assistant-Mail-And-Packages"; - rev = version; - hash = "sha256-w+7cC/jV+6bQM1aEPlO90Z1o9CcjmPvjNDSG9CduFFw="; + tag = version; + hash = "sha256-Am3EYkSYCQuYJmm6xdUwCa0h/ldk4hwTxRTxc0BU2j8="; }; nativeBuildInputs = with home-assistant.python.pkgs; [ + aioimaplib beautifulsoup4 dateparser pillow ]; + propagatedBuildInputs = with home-assistant.python.pkgs; [ + aioimaplib + ]; + postPatch = '' substituteInPlace custom_components/mail_and_packages/const.py \ --replace-fail 'DEFAULT_PATH = "custom_components/mail_and_packages/images/"' \ diff --git a/packages/python/gehomesdk/default.nix b/packages/python/gehomesdk/default.nix index 0b0d6f1..824e348 100644 --- a/packages/python/gehomesdk/default.nix +++ b/packages/python/gehomesdk/default.nix @@ -1,23 +1,21 @@ { lib, - python3Packages, + home-assistant, }: -python3Packages.buildPythonPackage rec { +home-assistant.python.pkgs.buildPythonPackage rec { pname = "gehomesdk"; version = "2026.2.0"; pyproject = true; - disabled = python3Packages.pythonOlder "3.9"; - - src = python3Packages.fetchPypi { + src = home-assistant.python.pkgs.fetchPypi { inherit pname version; hash = "sha256-+BWGkUDKd+9QGbdXuLjmJxLm1xUv0dpIRlPlDkUJ25w="; }; - build-system = with python3Packages; [ setuptools ]; + build-system = with home-assistant.python.pkgs; [ setuptools ]; - dependencies = with python3Packages; [ + dependencies = with home-assistant.python.pkgs; [ aiohttp beautifulsoup4 bidict