From 61ff23358ec9c8413e1a7060f6a5933c901da5db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 21:00:40 +0200 Subject: [PATCH 01/22] python310Packages.accuweather: 0.5.2 -> 1.0.0 https://github.com/bieniu/accuweather/releases/tag/1.0.0 --- pkgs/development/python-modules/accuweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index ec4adec7638..cff7fd06c8e 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.5.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rXA5A80PWn08VPeimJeMNWMGvzaE/gWrRuJseHiDkRg="; + hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA="; }; propagatedBuildInputs = [ From b5f4812bfec6a5261b5253753bef76bea4c799a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jun 2023 21:05:52 +0200 Subject: [PATCH 02/22] python311Packages.aioairzone: 0.5.5 -> 0.6.3 (#232482) Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.5.0...0.6.3 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.0 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.5.6 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.3 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 3d49fddec7d..4c6ef2d4980 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.5.5"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6PBNwCfh5ryR3Jub3GDykY6lRQt9wdkV8yWkvivuQpM="; + hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg="; }; nativeBuildInputs = [ From ea56bb2263f2bfd8127968bae0c677e172470956 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 21:10:55 +0200 Subject: [PATCH 03/22] python310Packages.devolo-plc-api: 1.3.0 -> 1.3.1 https://github.com/2Fake/devolo_plc_api/releases/tag/v1.3.1 --- .../python-modules/devolo-plc-api/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 5e3115d660d..8170601914a 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , httpx , protobuf , pytest-asyncio @@ -10,12 +9,13 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, syrupy , zeroconf }: buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-ika0mypHo7a8GCa2eNhOLIhMZ2ASwJOxV4mmAzvJm0E="; + hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "protobuf>=4.22.0" "protobuf" + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -44,6 +49,7 @@ buildPythonPackage rec { pytest-httpx pytest-mock pytestCheckHook + syrupy ]; pythonImportsCheck = [ From da3679780d2cae5b4bfafff6bc0ec471ba541c90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 21:15:01 +0200 Subject: [PATCH 04/22] home-assistant.intents: 2023.4.26 -> 2023.6.5 https://github.com/home-assistant/intents/compare/refs/tags/2023.4.26...2023.6.5 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 4444d6e9a24..37cb2abf83c 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.4.26"; + version = "2023.6.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-l22+scT/4qIU5qWlWURr5wVEBoWNXGqYEaS3IVwG1Zs="; + hash = "sha256-ZfPOxTFPQNdZ3Tq8p410RHlLGej+FOqhafD+91MRbRo="; }; sourceRoot = "source/package"; From 1f649e2175f974f2c58a51f7593a4edd8ea92f17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jun 2023 21:21:30 +0200 Subject: [PATCH 05/22] python310Packages.pydeconz: 111 -> 113 (#227928) Diff: https://github.com/Kane610/deconz/compare/refs/tags/v111...v113 Changelog: https://github.com/Kane610/deconz/releases/tag/v112 Changelog: https://github.com/Kane610/deconz/releases/tag/v113 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 7dbf0c8e6c6..a58e69fe025 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "111"; + version = "113"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ="; + hash = "sha256-Vf3nYUopaGY5JK//rqqsz47VRHwql1cQcslYbkH3owQ="; }; propagatedBuildInputs = [ From 3e7405111b188fc9d2648bf98edd716a68ae0771 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jun 2023 21:25:43 +0200 Subject: [PATCH 06/22] python311Packages.python-otbr-api: 1.2.0 -> 2.1.0 (#235045) Diff: https://github.com/home-assistant-libs/python-otbr-api/compare/refs/tags/1.2.0...2.1.0 Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/2.1.0 --- pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 723a4ebe02f..6bf28172e0a 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.2.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IPglUB+Xla+IjWzHhfG+SDHY/jucg46ppnhHBHKTEiE="; + hash = "sha256-LM09hQ5ELWLCymk8oxHcqTngs4mXg59uY2OrSpizQXo="; }; nativeBuildInputs = [ From 7e39159f27f05dabae4b597ae90795faea5ea5cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jun 2023 21:29:05 +0200 Subject: [PATCH 07/22] python311Packages.rokuecp: 0.17.1 -> 0.18.0 (#233753) Diff: https://github.com/ctalkington/python-rokuecp/compare/refs/tags/0.17.1...0.18.0 Changelog: https://github.com/ctalkington/python-rokuecp/releases/tag/0.18.0 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index d272d07ff19..a6d9f2e8fa0 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-3GHG4FBGMiF5kNk2gl05xiX9+5tcrUyi4SUCXTa6Qco="; + hash = "sha256-YvJ1+o7/S/QNROedYGsP8m99Dr+WpAkfe5YPEN+2ZhU="; }; nativeBuildInputs = [ From ab0369154c9b7982451c76ac3eefc390418bb55a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 21:31:06 +0200 Subject: [PATCH 08/22] python310Packages.xiaomi-ble: 0.17.1 -> 0.17.2 https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.17.2 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index bdb5888f352..2005879e519 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.17.1"; + version = "0.17.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CioXmv5VJBiJx97k69Sp5kaeD59p+OSL14RVse/gYUA="; + hash = "sha256-2zS34feelJNVarfe8GEZxBNL45IK+Owl6TlBDOTVvSs="; }; nativeBuildInputs = [ From 64131f06f21a7fbbd6552f935c92a373a59a6fa0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 21:32:59 +0200 Subject: [PATCH 09/22] python310Packages.zwave-js-server-python: 0.48.1 -> 0.49.0 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.49.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 56a33cec33a..7c9de5a6fbe 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.48.1"; + version = "0.49.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fkOzt5dFDbteMMuNAxOfdlsT83dB1528gQooTqv4WB8="; + hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8="; }; propagatedBuildInputs = [ From 9c5f25911caa1ccbb2a1b1cc642b8289f244e257 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 23:31:26 +0200 Subject: [PATCH 10/22] python310Packages.knx-frontend: init at 2023.5.31.141540 --- .../python-modules/knx-frontend/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/knx-frontend/default.nix diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix new file mode 100644 index 00000000000..15797260ad3 --- /dev/null +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "knx-frontend"; + version = "2023.5.31.141540"; + format = "pyproject"; + + # TODO: source build, uses yarn.lock + src = fetchPypi { + pname = "knx_frontend"; + inherit version; + hash = "sha256-j0p3PUYnKsyuDaN+nMrIHhxLYhNXVkZQkgsp//ZTsXE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "knx_frontend" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/XKNX/knx-frontend/releases/tag/${version}"; + description = "Home Assistant Panel for managing the KNX integration"; + homepage = "https://github.com/XKNX/knx-frontend"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a1693f83d0..8f25ae5b862 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5495,6 +5495,8 @@ self: super: with self; { kneed = callPackage ../development/python-modules/kneed { }; + knx-frontend = callPackage ../development/python-modules/knx-frontend { }; + kombu = callPackage ../development/python-modules/kombu { }; konnected = callPackage ../development/python-modules/konnected { }; From b57f066dea90ec16a3f24d5d82629c56595b964c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 23:43:50 +0200 Subject: [PATCH 11/22] home-assistant: 2023.5.4 -> 2023.6.0 https://www.home-assistant.io/blog/2023/06/07/release-20236/ --- .../home-assistant/component-packages.nix | 71 ++++++++++++++----- pkgs/servers/home-assistant/default.nix | 27 +------ pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/intents.nix | 5 ++ 4 files changed, 65 insertions(+), 42 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1583198cae3..7bebac1b445 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.5.4"; + version = "2023.6.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -93,6 +93,9 @@ "airzone" = ps: with ps; [ aioairzone ]; + "airzone_cloud" = ps: with ps; [ + aioairzone-cloud + ]; "aladdin_connect" = ps: with ps; [ aioaladdinconnect ]; @@ -686,6 +689,10 @@ "datadog" = ps: with ps; [ datadog ]; + "date" = ps: with ps; [ + ]; + "datetime" = ps: with ps; [ + ]; "ddwrt" = ps: with ps; [ ]; "debugpy" = ps: with ps; [ @@ -902,8 +909,15 @@ "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ + aiohttp-cors dynalite-devices - ]; + fnv-hash-fast + home-assistant-frontend + janus + pillow + psutil-home-assistant + sqlalchemy + ]; # missing inputs: dynalite_panel "eafm" = ps: with ps; [ aioeafm ]; @@ -947,6 +961,8 @@ "eight_sleep" = ps: with ps; [ pyeight ]; + "electrasmart" = ps: with ps; [ + ]; # missing inputs: pyelectra "elgato" = ps: with ps; [ elgato ]; @@ -1395,8 +1411,6 @@ "glances" = ps: with ps; [ glances-api ]; - "goalfeed" = ps: with ps; [ - ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; @@ -1430,6 +1444,11 @@ ]; "google_domains" = ps: with ps; [ ]; + "google_generative_ai_conversation" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + ]; # missing inputs: google-generativeai "google_mail" = ps: with ps; [ aiohttp-cors fnv-hash-fast @@ -1898,8 +1917,7 @@ zeroconf ]; "iotawatt" = ps: with ps; [ - iotawattpy - ]; + ]; # missing inputs: ha-iotawattpy "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ @@ -1945,6 +1963,8 @@ "justnimbus" = ps: with ps; [ justnimbus ]; + "jvc_projector" = ps: with ps; [ + ]; # missing inputs: pyjvcprojector "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kaleidescape" = ps: with ps; [ @@ -2034,8 +2054,15 @@ ]; "knx" = ps: with ps; [ aiohttp-cors + fnv-hash-fast + home-assistant-frontend janus + knx-frontend + pillow + psutil-home-assistant + sqlalchemy xknx + xknxproject ]; "kodi" = ps: with ps; [ aiohttp-cors @@ -2577,8 +2604,6 @@ psutil-home-assistant sqlalchemy ]; - "mycroft" = ps: with ps; [ - ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; @@ -2838,7 +2863,7 @@ opensensemap-api ]; "opensky" = ps: with ps; [ - ]; + ]; # missing inputs: python-opensky "opentherm_gw" = ps: with ps; [ pyotgw ]; @@ -2991,6 +3016,8 @@ ]; "pioneer" = ps: with ps; [ ]; + "piper" = ps: with ps; [ + ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ @@ -3672,8 +3699,6 @@ "smarttub" = ps: with ps; [ python-smarttub ]; - "smarty" = ps: with ps; [ - ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ smhi-pkg ]; @@ -4124,6 +4149,8 @@ webrtcvad zeroconf ]; + "time" = ps: with ps; [ + ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ @@ -4417,9 +4444,6 @@ ]; "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf - "watson_tts" = ps: with ps; [ - ibm-watson - ]; "watttime" = ps: with ps; [ aiowatttime ]; @@ -4446,6 +4470,8 @@ "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; + "whisper" = ps: with ps; [ + ]; "whois" = ps: with ps; [ whois ]; @@ -4557,6 +4583,8 @@ ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client + "yale_home" = ps: with ps; [ + ]; "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; @@ -4629,6 +4657,13 @@ "youless" = ps: with ps; [ youless-api ]; + "youtube" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "zabbix" = ps: with ps; [ py-zabbix ]; @@ -4723,6 +4758,7 @@ "airvisual" "airvisual_pro" "airzone" + "airzone_cloud" "aladdin_connect" "alarm_control_panel" "alarmdecoder" @@ -4809,6 +4845,8 @@ "crownstone" "daikin" "datadog" + "date" + "datetime" "debugpy" "deconz" "default_config" @@ -4838,7 +4876,7 @@ "dte_energy_bridge" "duckdns" "dunehd" - "dynalite" + "dwd_weather_warnings" "eafm" "easyenergy" "ecobee" @@ -5001,7 +5039,6 @@ "intent" "intent_script" "ios" - "iotawatt" "ipma" "ipp" "iqvia" @@ -5337,6 +5374,7 @@ "tibber" "tile" "tilt_ble" + "time" "time_date" "timer" "tod" @@ -5433,6 +5471,7 @@ "yeelight" "yolink" "youless" + "youtube" "zamg" "zeroconf" "zerproc" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 72a1525ad73..0c0b34712a5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -183,16 +183,6 @@ let }; }); - python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { - version = "0.8.3"; - src = fetchFromGitHub { - owner = "humbertogontijo"; - repo = "python-roborock"; - rev = "refs/tags/v${version}"; - hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -261,17 +251,6 @@ let }; }); - # Pinned due to API changes in 0.4.0 - vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { - version = "0.3.3"; - src = fetchFromGitHub { - owner = "ManneW"; - repo = "vilfo-api-client-python"; - rev = "v${version}"; - sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; - }; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -317,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.5.4"; + hassVersion = "2023.6.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -333,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-mRiRKMafRkgAOshH/5i6yj379FEzZgXhkdkK557sMaQ="; + hash = "sha256-dEszA95EIwGMR2Ztpe7P8weh4FbqGJBkso7nCvTkPDc="; }; # Secondary source is git for tests @@ -341,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-r28BhC6lBIoxu7Wp/1h+qgPEDaUCqH4snyKk/h/vgyQ="; + hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 94d868e3dbb..ff33cc8cee9 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230503.3"; + version = "20230607.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU="; + hash = "sha256-O3hAF3QgZHm6q+manxlqWZLlSDxHMr86B3GdwMClxEk="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 37cb2abf83c..ae247b9e7a0 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { sourceRoot = "source/package"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "2023.4.26" "${version}" + ''; + nativeBuildInputs = [ hassil jinja2 From 4540dad9e7b4962e11864c042fa1d65cdf5d3455 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Jun 2023 23:55:51 +0200 Subject: [PATCH 12/22] nixos/tests/home-assistant: Drop esphome, fix post-restart expectation Mentioning esphome in the config is now causing an error. Check for the backup module post-restart, not esphome. --- nixos/tests/home-assistant.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index cef0f97c194..e06c52a5f41 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -62,7 +62,6 @@ in { frontend = {}; # include some popular integrations, that absolutely shouldn't break - esphome = {}; knx = {}; shelly = {}; zha = {}; @@ -198,7 +197,7 @@ in { with subtest("Check that new components get setup after restart"): journal = get_journal_since(cursor) - for domain in ["esphome"]: + for domain in ["backup"]: assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing" with subtest("Check that no errors were logged"): From 314c23eaeb572e81e59f14173bdfffcb573154e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 00:32:15 +0200 Subject: [PATCH 13/22] python310Packages.zigpy-decopnf: drop asynctest It is only used for testing on python < 3.8 and is unsupported on 3.11. --- pkgs/development/python-modules/zigpy-deconz/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 3566158edf4..b9220505c77 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub , pyserial @@ -31,7 +30,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest pytest-asyncio pytestCheckHook ]; From cb7e043e58d6be9e336cdca976b5e7be9e5234f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 00:32:53 +0200 Subject: [PATCH 14/22] python310Packages.zigpy-xbee: drop asynctest It is only used for testing on python < 3.8 and is unsupported on 3.11. --- pkgs/development/python-modules/zigpy-xbee/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index dc0cfb66596..96b95ee4e64 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -1,8 +1,6 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub -, fetchpatch , pyserial , pyserial-asyncio , pytest-asyncio @@ -33,7 +31,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest pytest-asyncio pytestCheckHook ]; From 2d29bf70741b8945dfd405535569c4824c4972a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 00:33:13 +0200 Subject: [PATCH 15/22] home-assistant: migrate to python311 Support for 3.10 will run out in 2023.8.0, and ideally we'll be ahead of the curve. --- pkgs/servers/home-assistant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 0c0b34712a5..b186ea46bb3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi -, python3 +, python311 , substituteAll , ffmpeg-headless , inetutils @@ -278,7 +278,7 @@ let }) ]; - python = python3.override { + python = python311.override { packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; @@ -323,7 +323,7 @@ in python.pkgs.buildPythonApplication rec { hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk="; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ setuptools ]; @@ -479,7 +479,7 @@ in python.pkgs.buildPythonApplication rec { getPackages python supportedComponentsWithTests; - pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); + pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); frontend = python.pkgs.home-assistant-frontend; intents = python.pkgs.home-assistant-intents; tests = { From f0e6287cc30a98a8352cd2a5dc2727361731a8ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 00:48:55 +0200 Subject: [PATCH 16/22] python311Packages.pyhaversion: disable failing tests --- .../python-modules/pyhaversion/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index edc05d1aca0..204b8526d87 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; }; + postPatch = '' + # Upstream doesn't set a version for the tagged releases + substituteInPlace setup.py \ + --replace "main" ${version} + ''; + propagatedBuildInputs = [ aiohttp awesomeversion @@ -34,17 +40,16 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the tagged releases - substituteInPlace setup.py \ - --replace "main" ${version} - ''; - - pythonImportsCheck = [ "pyhaversion" ]; + disabledTests = [ + # Error fetching version information from HaVersionSource.SUPERVISOR Server disconnected + "test_stable_version" + "test_etag" + ]; + meta = with lib; { description = "Python module to the newest version number of Home Assistant"; homepage = "https://github.com/ludeeus/pyhaversion"; From 9cc57907f757dd535f792e0c3820f4478653d715 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 01:21:38 +0200 Subject: [PATCH 17/22] python311Packages.maxcube-api: disable failing tests Disable the two offending tests and unmark the package as broken. --- .../python-modules/maxcube-api/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/maxcube-api/default.nix b/pkgs/development/python-modules/maxcube-api/default.nix index 5e7b10555bc..e239fde3e1d 100644 --- a/pkgs/development/python-modules/maxcube-api/default.nix +++ b/pkgs/development/python-modules/maxcube-api/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { @@ -23,7 +22,14 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "license=license" "license='MIT'" ''; - nativeCheckInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "testSendRadioMsgClosesConnectionOnErrorAndRetriesIfReusingConnection" + "testSendRadioMsgReusesConnection" + ]; pythonImportsCheck = [ "maxcube" @@ -31,8 +37,6 @@ buildPythonPackage rec { ]; meta = with lib; { - # Tests indicate lack of 3.11 compatibility - broken = pythonAtLeast "3.11"; description = "eQ-3/ELV MAX! Cube Python API"; homepage = "https://github.com/hackercowboy/python-maxcube-api"; license = licenses.mit; From 6ec6e8cda048df9cacd3df1a48576baf40859421 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 01:31:08 +0200 Subject: [PATCH 18/22] home-assistant-component-tests: disable xdist We have enough components that we can parallelize them when tested in bulk, but even with one xdist thread some tests fail every once in a while. --- pkgs/servers/home-assistant/tests.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 87aacda6f8c..91a902a8a2d 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -87,7 +87,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( dontUsePytestXdist = true; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray - ++ [ "--numprocesses=2" ] ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; From c0ef3e612122f0874ab149df1c2b20e1140ef706 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 01:39:52 +0200 Subject: [PATCH 19/22] python310Packages.python-tado: 0.12.0 -> 0.15.0 --- .../python-modules/python-tado/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 2e518b6eced..4f4f62cea91 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -1,20 +1,33 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pythonOlder, requests }: +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +, pythonOlder +, requests +}: -buildPythonPackage rec { +buildPythonPackage { pname = "python-tado"; - version = "0.12.0"; + version = "0.15.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; - rev = version; - hash = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ="; + # https://github.com/wmalgadey/PyTado/issues/62 + rev = "674dbc450170a380e76460c22d6ba943dfedb8e9"; + hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s="; }; - propagatedBuildInputs = [ requests ]; - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = From 5975b3f92ab21e708c4b504ef2e2642b4ee65600 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 01:47:23 +0200 Subject: [PATCH 20/22] python311Packages.pyzerproc: disable failing tests --- pkgs/development/python-modules/pyzerproc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index a453014fe8b..b5eb5491671 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , pytest-asyncio , pytest-mock +, pythonAtLeast , pytestCheckHook , pythonOlder }: @@ -38,6 +39,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [ + # unittest.mock.InvalidSpecError: Cannot spec a Mock object. + "tests/test_light.py" + ]; + pythonImportsCheck = [ "pyzerproc" ]; From 67b191adcb15cdcc9f14b8beefb3b6608512623b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 12:00:56 +0200 Subject: [PATCH 21/22] python311Packages.homeassistant-stubs: 2023.5.4 -> 2023.6.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.6.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 2a5a97ac2d5..90168a5a869 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.5.4"; + version = "2023.6.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-2vexK+b+Zy1hvOgjOnsyUMxn2zdu6Gr3Sdk6XqEQRH4="; + hash = "sha256-efwrTHWc4m4biP7b39OU1GRifoKm49hEUTtIfrNGUeA="; }; nativeBuildInputs = [ From 6b40b65cca732d0931978d72252a44ccb2290165 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jun 2023 13:53:02 +0200 Subject: [PATCH 22/22] python310Packages.zigpy-znp: Remove xdist, rerun failed tests Clean out disabled tests, remove xdist because on aarch64-linux I could see racy tests that were run on an already closed event loop. Then there was some flakyness, for which rerunfailures made sense to use, ultimately making the test suite more stable. --- .../python-modules/zigpy-znp/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 859bb451203..e110e001c61 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -6,8 +6,8 @@ , jsonschema , pytest-asyncio , pytest-mock +, pytest-rerunfailures , pytest-timeout -, pytest-xdist , pytestCheckHook , pythonOlder , voluptuous @@ -44,20 +44,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-mock + pytest-rerunfailures pytest-timeout - pytest-xdist pytestCheckHook ]; - disabledTests = [ - # https://github.com/zigpy/zigpy-znp/issues/209 - "test_join_device" - "test_permit_join" - "test_request_recovery_route_rediscovery_af" - "test_request_recovery_route_rediscovery_zdo" - "test_zigpy_request" - "test_zigpy_request_failure" - "test_mgmt_nwk_update_req" + pytestFlagsArray = [ + "--reruns=3" ]; pythonImportsCheck = [