From f04b356c191ce84f910a7a48a369d22bc26fda68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 17:56:57 +0100 Subject: [PATCH 01/12] python311Packages.aiohomekit: 3.1.1 -> 3.1.2 https://github.com/Jc2k/aiohomekit/releases/tag/3.1.2 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 346bd810fdb6..ffab6af2b8f4 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-6dR7hMcHOjbFl4tnInMEYfnEWMFx+A+9TXoBcB83mrE="; + hash = "sha256-GepXC3u37NuTWCoecUkR1+Ic/5ztn3f6cUlalZ0Na4o="; }; nativeBuildInputs = [ From 50d7d58e997240a10ce86bb970b45fb10e44b2f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 Jan 2024 15:54:07 +0100 Subject: [PATCH 02/12] python311Packages.home-assistant-bluetooth: 1.10.4 -> 1.11.0 https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v1.11.0/CHANGELOG.md --- .../home-assistant-bluetooth/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index c5cd3d2e4f3c..eb43493f25e7 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,25 +2,32 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder + +# build-system , cython , poetry-core , setuptools + +# dependencies +, habluetooth + +# tests , bleak , pytestCheckHook }: buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.4"; - format = "pyproject"; + version = "1.11.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "home-assistant-bluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-7gkesxQI6QBxyQpHlSSh1w6MDeid0dSdXn+jnxvafD0="; + hash = "sha256-1Bp43TaJkrT9lZsBu4yiuOD4tE7vv6bYRlcgTfNwOuA="; }; postPatch = '' @@ -35,7 +42,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - bleak + habluetooth ]; pythonImportsCheck = [ @@ -43,6 +50,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + bleak pytestCheckHook ]; From cd3b8e76fc6c6ad65ae61e4c47d307c5b7271915 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 Jan 2024 15:54:40 +0100 Subject: [PATCH 03/12] python311Packages.habluetooth: drop dependency on home-assistant-bluetooth This package never depended on home-assistant-bluetooth, and was now causing an infinite recursion, because home-assistant-bluetooth depends on it. --- pkgs/development/python-modules/habluetooth/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index f8cf97e963d9..4fe54823c4ea 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -11,7 +11,6 @@ , bluetooth-adapters , bluetooth-auto-recovery , bluetooth-data-tools -, home-assistant-bluetooth , pythonOlder }: @@ -47,7 +46,6 @@ buildPythonPackage rec { bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools - home-assistant-bluetooth ]; nativeCheckInputs = [ From 05632cd997bc21701a739d44c251a5511a99b481 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Jan 2024 21:25:31 +0100 Subject: [PATCH 04/12] python311Packages.habluetooth: 2.0.1 -> 2.0.2 Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v2.0.1...v2.0.2 Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v2.0.2/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 4fe54823c4ea..759bd04b6ab5 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-vUq3WVo9dAt4Q/oid9ixLwI6v6jCavRU9FZYR6t6TzI="; + hash = "sha256-3HyFKg+JR48MQrWmOjOQV2qhVHRHLnJHvtvBajXPDMg="; }; postPatch = '' From 325617f0066ae61d28b9821ddd3e38ebed754d6e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 22:45:15 +0100 Subject: [PATCH 05/12] python311Packages.orvibo: 1.1.1 -> 1.1.2 https://github.com/happyleavesaoc/python-orvibo/compare/1.1.1...1.1.2 --- pkgs/development/python-modules/orvibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix index 031866b688b9..0b08b3d1a0c1 100644 --- a/pkgs/development/python-modules/orvibo/default.nix +++ b/pkgs/development/python-modules/orvibo/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "orvibo"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "happyleavesaoc"; repo = "python-orvibo"; rev = version; - sha256 = "042prd5yxqvlfija7ii1xn424iv1p7ndhxv6m67ij8cbvspwx356"; + sha256 = "sha256-Azmho47CEbRo18emmLKhYa/sViQX0oxUTUk4zdrpOaE="; }; # Project as no tests From efa9d6852c863ca5b9ef4651c639e9014bc690c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 17:59:35 +0100 Subject: [PATCH 06/12] python311Packages.openwebifpy: 4.0.2 -> 4.0.4 https://github.com/autinerd/openwebifpy/releases/tag/4.0.3 https://github.com/autinerd/openwebifpy/releases/tag/4.0.4 --- pkgs/development/python-modules/openwebifpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index ab054c3b8288..8672e8a7695f 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.0.2"; + version = "4.0.4"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-D2NCTn1Q3/AknmEAAOZO4d7i2mpM/kMlt94RaLmmnjM="; + hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ="; }; nativeBuildInputs = [ From b8631ec6ddf7786e4048da72ceb4019ac940d420 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 18:01:53 +0100 Subject: [PATCH 07/12] python311Packages.python-tado: 0.17.2 -> 0.17.3 https://github.com/wmalgadey/PyTado/compare/refs/tags/0.17.2...0.17.3 --- pkgs/development/python-modules/python-tado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 017be9041dc1..80687b9d3e1f 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.17.2"; + version = "0.17.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "PyTado"; # https://github.com/wmalgadey/PyTado/issues/62 rev = "refs/tags/${version}"; - hash = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; + hash = "sha256-whpNYiAb2cqKI4m0HJN2lPt51FLuEzrkrRTSWs6uznU="; }; propagatedBuildInputs = [ From 501f76b695da1065081080511a968fcf8e1a5a36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 18:02:24 +0100 Subject: [PATCH 08/12] python311Packages.zwave-js-server-python: 0.55.2 -> 0.55.3 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.55.3 --- .../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 b987e5498941..bd5db6bf2baf 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.55.2"; + version = "0.55.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yZlYsaN9j8WVtxWIXeH4Jqyo0xpDOC+2DCE8UA1c9h8="; + hash = "sha256-FTcj0xZnIt0P6J/QRMC0bwcbRIVmpSWTorvE/AV/5PU="; }; nativeBuildInputs = [ From c3393e3a4b79cc5300664bc1cb9908e302071955 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 18:04:20 +0100 Subject: [PATCH 09/12] home-assistant: 2024.1.0 -> 2024.1.1 https://github.com/home-assistant/core/releases/tag/2024.1.1 --- pkgs/servers/home-assistant/component-packages.nix | 6 ++++-- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3a1ca7a707b0..2e93ed806231 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 = "2024.1.0"; + version = "2024.1.1"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -1042,9 +1042,10 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + dropmqttapi janus paho-mqtt - ]; # missing inputs: dropmqttapi + ]; "dsmr" = ps: with ps; [ dsmr-parser ]; @@ -5846,6 +5847,7 @@ "doorbird" "dormakaba_dkey" "dremel_3d_printer" + "drop_connect" "dsmr" "dsmr_reader" "dte_energy_bridge" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e10dfba0ea06..9a469d438f21 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -312,7 +312,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.1.0"; + hassVersion = "2024.1.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -330,13 +330,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-aNSyBr4QEK4pmYnRGW1LNuCSU5EpZtLEGQUtYL+CvUg="; + hash = "sha256-jTBNjVBPtxNG+5Ju3Dgjnpl9i5DM6qo92yWKNaFzfCo="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-szlvSfkcPG6DGGHZ5iNtz0EBa8DVYaoGZWSlc7AEG1I="; + hash = "sha256-LpiZ9cvfMgzpDtEriiTeDGIsl9QX8LzebzUtb8H73VE="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 3e7f58c42116..c3584697ea01 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 = "20240103.3"; + version = "20240104.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-xCYAGig8sKZHa2Ix+XhR33xcKPucwvQFikuYjXpqzNM="; + hash = "sha256-AQkrnU5UKsrl02CXDNf/aMTPII39poWJoZ4nBpySTZE="; }; # there is nothing to strip in this package From 94f7520bb6e457e8a1f076a0a3f5f739470e8142 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 21:44:19 +0100 Subject: [PATCH 10/12] home-assistant: update disabled tests and dependencies --- pkgs/servers/home-assistant/tests.nix | 107 ++++++++++---------------- 1 file changed, 41 insertions(+), 66 deletions(-) diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 15f1cd6f2904..3cce799ec19a 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,45 +5,53 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - airzone_cloud = [ aioairzone ]; - alexa = [ av ]; - bluetooth = [ pyswitchbot ]; - bthome = [ xiaomi-ble ]; - camera = [ av ]; - cloud = [ mutagen ]; - config = [ pydispatcher ]; - generic = [ av ]; - google_translate = [ mutagen ]; - google_sheets = [ oauth2client ]; - govee_ble = [ ibeacon-ble ]; - hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; - homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - lovelace = [ pychromecast ]; - matrix = [ pydantic ]; - mopeka = [ pyswitchbot ]; - nest = [ av ]; - onboarding = [ pymetno radios rpi-bad-power ]; - otbr = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; - raspberry_pi = [ rpi-bad-power ]; - shelly = [ pyswitchbot ]; - tilt_ble = [ govee-ble ibeacon-ble ]; - tomorrowio = [ pyclimacell ]; - version = [ aioaseko ]; - xiaomi_miio = [ arrow ]; - voicerss = [ mutagen ]; - yandextts = [ mutagen ]; - zha = [ pydeconz ]; - zwave_js = [ homeassistant-pyozw ]; + airzone_cloud = [ + aioairzone + ]; + bluetooth = [ + pyswitchbot + ]; + govee_ble = [ + ibeacon-ble + ]; + lovelace = [ + pychromecast + ]; + matrix = [ + pydantic + ]; + mopeka = [ + pyswitchbot + ]; + onboarding = [ + pymetno + radios + rpi-bad-power + ]; + raspberry_pi = [ + rpi-bad-power + ]; + shelly = [ + pyswitchbot + ]; + tilt_ble = [ + ibeacon-ble + ]; + xiaomi_miio = [ + arrow + ]; + zha = [ + pydeconz + ]; }; extraDisabledTestPaths = { }; extraDisabledTests = { - mqtt = [ - # Assert None is not None - "test_handle_logging_on_writing_the_entity_state" + private_ble_device = [ + # AssertionError: assert '90' == '90.0' + "test_estimated_broadcast_interval" ]; shell_command = [ # tries to retrieve file from github @@ -53,17 +61,9 @@ let # missing operating_status attribute in entity "test_sensor_entities" ]; - vesync = [ - # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration - "test_async_get_config_entry_diagnostics__single_humidifier" - "test_async_get_device_diagnostics__single_fan" - ]; }; extraPytestFlagsArray = { - conversation = [ - "--deselect tests/components/conversation/test_init.py::test_get_agent_list" - ]; cloud = [ # Tries to connect to alexa-api.nabucasa.com:443 "--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state" @@ -72,41 +72,16 @@ let # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ]; - history_stats = [ - # Flaky: AssertionError: assert '0.0' == '12.0' - "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" - ]; jellyfin = [ # AssertionError: assert 'audio/x-flac' == 'audio/flac' "--deselect tests/components/jellyfin/test_media_source.py::test_resolve" # AssertionError: assert [+ received] == [- snapshot] "--deselect tests/components/jellyfin/test_media_source.py::test_music_library" ]; - modbus = [ - # homeassistant.components.modbus.modbus:modbus.py:317 Pymodbus: modbusTest: Modbus Error: test connect exception - "--deselect tests/components/modbus/test_init.py::test_pymodbus_connect_fail" - ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; - sonos = [ - # KeyError: 'sonos_media_player' - "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings" - "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3" - ]; - unifiprotect = [ - # "TypeError: object Mock can't be used in 'await' expression - "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" - ]; - xiaomi_ble = [ - # assert 0 == 1" - "--deselect tests/components/xiaomi_ble/test_sensor.py::test_xiaomi_consumable" - ]; - zha = [ - "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" - "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" - ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { From a1bbf98643e851f0a6ff40e0082c34e263190641 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Jan 2024 23:30:13 +0100 Subject: [PATCH 11/12] python311Packages.homeassistant-pyozw: remove --- .../homeassistant-pyozw/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/homeassistant-pyozw/default.nix diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix deleted file mode 100644 index 271059e48518..000000000000 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ python_openzwave, fetchPypi, openzwave, fetchFromGitHub }: - -(python_openzwave.override { - openzwave = openzwave.overrideAttrs (oldAttrs: { - version = "unstable-2020-03-24"; - - src = fetchFromGitHub { - owner = "home-assistant"; - repo = "open-zwave"; - rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83"; - sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk"; - }; - - patches = [ ]; - }); -}).overridePythonAttrs (oldAttrs: rec { - pname = "homeassistant_pyozw"; - version = "0.1.10"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "47c1abd8f3dc287760471c6c7b5fad222ead64763c4cb25e37d0599ea3b26952"; - }; - - patches = []; - meta.homepage = "https://github.com/home-assistant/python-openzwave"; -}) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 31b8be67c123..6f7e44601d88 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -194,6 +194,7 @@ mapAliases ({ hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hglib = python-hglib; # added 2023-10-13 + homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05 HTSeq = htseq; # added 2023-02-19 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d38976064ce..5ec6ba9fec68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5178,8 +5178,6 @@ self: super: with self; { home-assistant-chip-core = callPackage ../development/python-modules/home-assistant-chip-core { }; - homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - homeassistant-stubs = callPackage ../servers/home-assistant/stubs.nix { }; homeconnect = callPackage ../development/python-modules/homeconnect { }; From 1fe3d7105b78a54d65f92b93ff0a54d923847d46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Jan 2024 04:38:30 +0100 Subject: [PATCH 12/12] python311Packages.homeassistant-stubs: 2024.1.0 -> 2024.1.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.1.1 --- 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 fb28cb66f40c..6766ff6ef2d0 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 = "2024.1.0"; + version = "2024.1.1"; 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-FOf0MCyYIIoPa7H39rY+2jUy7O6/c4DDRhDHJ7tSEcU="; + hash = "sha256-jVmjMs1OmxSnx0cQHXbAezJhkv5V8PRJOSDmfx0XQ9o="; }; nativeBuildInputs = [