diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index 5284643..a9e5deb 100644 --- a/modules/nixos/homeassistant/services/homeassistant/default.nix +++ b/modules/nixos/homeassistant/services/homeassistant/default.nix @@ -233,7 +233,6 @@ in better_thermostat localtuya luxer_one - ntfy prometheus_sensor roborock_custom_map smartir @@ -270,7 +269,7 @@ in # use postgresql instead of sqlite extraPackages = ps: with ps; [ - # pkgs.${namespace}.python-roborock + pkgs.${namespace}.python-roborock # pkgs.${namespace}.pyvesync # # Core functionality # aiohttp diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index b7d86a8..e36d1af 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.1.27"; + version = "v2.2.12"; src = fetchFromGitHub { owner = owner; repo = "ha-bambulab"; rev = version; - hash = "sha256-zHPXPYsHrJXOnSqllZqDrxGZDDqyXllC3XEGZRJil0Q="; + hash = "sha256-WCUXzfJGfzgFL24V4NljCnml8SJ1un85t5IjkTj3lJY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-icloud3/default.nix b/packages/homeassistant/ha-icloud3/default.nix index d0c5869..2d806eb 100644 --- a/packages/homeassistant/ha-icloud3/default.nix +++ b/packages/homeassistant/ha-icloud3/default.nix @@ -7,16 +7,17 @@ buildHomeAssistantComponent rec { owner = "gcobb321"; domain = "icloud3"; - version = "3.2.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = owner; repo = "icloud3"; rev = "v${version}"; - hash = "sha256-RyH25elL/0+xnJcgAx9LzYpLy5JcWuMagJiJXKbgz/s="; + hash = "sha256-dwJXGgAramiBtKmbG0i3iJTeAAeGjmq+2CwZjbcPRlw="; }; propagatedBuildInputs = with python3Packages; [ + fido2 srp ]; diff --git a/packages/homeassistant/ha-local-llm/default.nix b/packages/homeassistant/ha-local-llm/default.nix index bf92517..9326c89 100644 --- a/packages/homeassistant/ha-local-llm/default.nix +++ b/packages/homeassistant/ha-local-llm/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "acon96"; domain = "llama_conversation"; - version = "v0.4.1"; + version = "v0.4.3"; src = fetchFromGitHub { owner = owner; repo = "home-llm"; rev = version; - hash = "sha256-4XmdSHWBGnvjPcTPeu+Ifkuv3BFswR0I/gQipXOWi0o="; + hash = "sha256-VldTF7G/ZUexLAAKiyuFWmFlzfvjcCioqjogScQ3Z3g="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index 879e24a..6b791bc 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "moralmunky"; domain = "mail_and_packages"; - version = "0.4.2"; + version = "0.4.3-b20"; src = fetchFromGitHub { owner = owner; repo = "Home-Assistant-Mail-And-Packages"; rev = version; - hash = "sha256-5LBTlRlkSUx8DOY+F7UvUs4dzjZKdBdgnDUdK6DBdew="; + hash = "sha256-ueZcfhspi+aViiZ//AJuExeB1Dk/DUeGXYogrXqiy3Q="; }; propagatedBuildInputs = with python3Packages; [ @@ -26,8 +26,14 @@ buildHomeAssistantComponent rec { substituteInPlace custom_components/mail_and_packages/const.py \ --replace-fail 'DEFAULT_PATH = "custom_components/mail_and_packages/images/"' \ 'DEFAULT_PATH = "/var/lib/homeassistant/images/"' \ + --replace-fail 'DEFAULT_STORAGE = "custom_components/mail_and_packages/images/"' \ + 'DEFAULT_STORAGE = "/var/lib/homeassistant/images/"' \ --replace-fail 'DEFAULT_CUSTOM_IMG_FILE = "custom_components/mail_and_packages/images/mail_none.gif"' \ 'DEFAULT_CUSTOM_IMG_FILE = "/var/lib/homeassistant/images/mail_none.gif"' + + substituteInPlace custom_components/mail_and_packages/helpers.py \ + --replace-fail 'return "custom_components/mail_and_packages/images/"' \ + 'return "/var/lib/homeassistant/images/"' ''; meta = { diff --git a/packages/homeassistant/ha-nanokvm/default.nix b/packages/homeassistant/ha-nanokvm/default.nix index 41719b3..39b7ec5 100644 --- a/packages/homeassistant/ha-nanokvm/default.nix +++ b/packages/homeassistant/ha-nanokvm/default.nix @@ -8,18 +8,23 @@ buildHomeAssistantComponent rec { owner = "Wouter0100"; domain = "nanokvm"; - version = "v0.0.1"; + version = "v0.0.4"; src = fetchFromGitHub { owner = owner; repo = "homeassistant-nanokvm"; - rev = "663f9710dfea109f0bb0417df5828b8d639e70c4"; - hash = "sha256-6rTEOshNCe0x4iEHljqY/6p2TK1HasgNycRHkmo2Hhw="; + rev = "d52fac6add2c750e3d824b736e10ebf929329494"; + hash = "sha256-pyGGYFzz7lTTffpnWdjXcFDDQgrwAfMzBL/hAFTwLmQ="; }; propagatedBuildInputs = [ pkgs.${namespace}.python-nanokvm ]; + + postPatch = '' + substituteInPlace custom_components/nanokvm/manifest.json \ + --replace-fail '"nanokvm>=0.0.4"' '"nanokvm"' + ''; meta = { changelog = "https://github.com/Wouter0100/homeassistant-nanokvm/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-openhasp/default.nix b/packages/homeassistant/ha-openhasp/default.nix index 46d555f..c04cc89 100644 --- a/packages/homeassistant/ha-openhasp/default.nix +++ b/packages/homeassistant/ha-openhasp/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "HASwitchPlate"; domain = "openhasp"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = owner; repo = "openHASP-custom-component"; rev = version; - hash = "sha256-9IGZO+o9v6xyPbHRxBwmsGsryVwaB+fFXsK2kn5ztnA="; + hash = "sha256-sHrCsyxThUgUAadQBaC9wBVKzMojCJYjA5CUryN5+9g="; }; propagatedBuildInputs = with pkgs.python3Packages; [ diff --git a/packages/homeassistant/ha-petlibro/default.nix b/packages/homeassistant/ha-petlibro/default.nix index 3ee4568..f40ade0 100644 --- a/packages/homeassistant/ha-petlibro/default.nix +++ b/packages/homeassistant/ha-petlibro/default.nix @@ -2,13 +2,13 @@ buildHomeAssistantComponent rec { owner = "jjjonesjr33"; domain = "petlibro"; - version = "v1.0.22.3"; + version = "v1.2.30.5"; src = fetchFromGitHub { owner = owner; repo = "petlibro"; rev = version; - hash = "sha256-fYzy4OpK9Fs+KQ44H4G6DJlcSg9Zyi56fjsmdxDBviM="; + hash = "sha256-Jcl1DxYFuddcQiqdjs1P62wCwNPrWdBbhdWrmECGUxQ="; }; meta = { diff --git a/packages/python/python-nanokvm/default.nix b/packages/python/python-nanokvm/default.nix index abd093c..0924b61 100644 --- a/packages/python/python-nanokvm/default.nix +++ b/packages/python/python-nanokvm/default.nix @@ -1,14 +1,14 @@ { python3Packages, fetchFromGitHub, ... }: python3Packages.buildPythonPackage rec { - pname = "python-nanokvm"; - version = "v0.0.3"; + pname = "nanokvm"; + version = "0.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "puddly"; - repo = pname; - rev = version; - sha256 = "sha256-jBBd+O3S/4AlxAhrF9j9Bi5vMKZNk0M17ok9JzcI8F8="; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "sha256-L2Z4zZUbNQPrJVd0TGA5obB3tnd+Pk7HL5J+9WOAes0="; }; buildInputs = with python3Packages; [ diff --git a/packages/python/python-roborock/default.nix b/packages/python/python-roborock/default.nix index dbe1225..fdfc345 100644 --- a/packages/python/python-roborock/default.nix +++ b/packages/python/python-roborock/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "python-roborock"; - version = "2.39.0"; + version = "3.8.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -17,17 +17,15 @@ python3Packages.buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-V0zuUlJ0wPpxOKtY7ydbJ7mhWT5xGSLv19csmpWCO1Q="; + hash = "sha256-Ts1X07eTv4KXv344F3fGazHlDx6XXGQfdmxb+gd/0qc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "poetry-core==1.8.0" "poetry-core" - ''; - pythonRelaxDeps = [ "pycryptodome" ]; - build-system = with python3Packages; [ poetry-core ]; + build-system = with python3Packages; [ + poetry-core + hatchling + ]; dependencies = with python3Packages; @@ -36,6 +34,7 @@ python3Packages.buildPythonPackage rec { aiomqtt async-timeout click + click-shell construct dacite paho-mqtt @@ -51,6 +50,7 @@ python3Packages.buildPythonPackage rec { freezegun pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "roborock" ];