From 4f3413deb8d1bde5b1a546264610a6690758f0b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 02:58:19 +0100 Subject: [PATCH 1/4] python3Packages.HAP-python: 3.3.2 -> 3.4.0 --- .../python-modules/HAP-python/default.nix | 46 +++++++------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix index 2e740fcc2c8..c12285a287a 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, base36 , cryptography , curve25519-donna , ecdsa , ed25519 , fetchFromGitHub , h11 +, pyqrcode , pytest-asyncio , pytest-timeout , pytestCheckHook @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "HAP-python"; - version = "3.3.2"; + version = "3.4.0"; disabled = pythonOlder "3.5"; # pypi package does not include tests @@ -23,15 +25,17 @@ buildPythonPackage rec { owner = "ikalchev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; + sha256 = "0mkrs3fwiyp4am9fx1dnhd9h7rphfwymr46khw40xavrfb5jmsa7"; }; propagatedBuildInputs = [ + base36 cryptography curve25519-donna ecdsa ed25519 h11 + pyqrcode zeroconf ]; @@ -41,35 +45,19 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disable tests requiring network access + disabledTestPaths = [ + "tests/test_accessory_driver.py" + "tests/test_hap_handler.py" + "tests/test_hap_protocol.py" + ]; + disabledTests = [ - # Disable tests needing network - "camera" - "pair" - "test_async_subscribe_client_topic" - "test_auto_add_aid_mac" - "test_connection_management" - "test_crypto_failure_closes_connection" - "test_empty_encrypted_data" - "test_external_zeroconf" - "test_get_accessories" - "test_get_characteristics" - "test_handle_set_handle_set" - "test_handle_snapshot_encrypted_non_existant_accessory" - "test_http_11_keep_alive" - "test_http10_close" - "test_mdns_service_info" - "test_mixing_service_char_callbacks_partial_failure" - "test_not_standalone_aid" - "test_persist" - "test_push_event" - "test_send_events" - "test_service_callbacks" - "test_set_characteristics_with_crypto" - "test_setup_endpoints" - "test_start" - "test_upgrade_to_encrypted" + "test_persist_and_load" + "test_we_can_connect" + "test_idle_connection_cleanup" "test_we_can_start_stop" - "test_xhm_uri" + "test_push_event" ]; meta = with lib; { From 39447c654951bd0ddf466ff79cae7cfdfb80a8f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 02:59:26 +0100 Subject: [PATCH 2/4] python3Packages.pymysensors: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/pymysensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index bbfeec3a36c..24d7d4c2826 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.20.1"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + sha256 = "1k75gwvyzslyjr3cdx8b74fb302k2i7bda4q92rb75rhgp4gch55"; }; propagatedBuildInputs = [ From 7218f5d664cde17f3bcf1ad6a733fa43b1641df5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 03:04:16 +0100 Subject: [PATCH 3/4] python3Packages.pytile: 5.1.1 -> 5.2.1 Relax aiohttp dependency, the required update is in staging-next. --- pkgs/development/python-modules/pytile/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 226fdbc715e..720fdff743e 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,18 +13,22 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.1.1"; + version = "5.2.1"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM="; + sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; }; format = "pyproject"; + postPatch = '' + substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ From 7b82fbf63b53ce7d11b5e206cbff8a8a1178d890 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 03:09:42 +0100 Subject: [PATCH 4/4] home-assistant: 2021.3.2 -> 2021.3.3 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 899a0731c6d..347dd2137c8 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 = "2021.3.2"; + version = "2021.3.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -609,7 +609,7 @@ "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; - "ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 329bbac4fb7..34a8f7f6c04 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -66,7 +66,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.3.2"; + hassVersion = "2021.3.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -85,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "09z2sds9my4vq0vmryjpzi7fv787zjfikfkd711d34c140bgcjch"; + sha256 = "0kfvjpzz6ynw8bwd91nm0aiw1pkrmaydwf1r93dnwi8rmzq10zpb"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6a4f4420ff1..6db728e9c8b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ 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 = "20210302.5"; + version = "20210302.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SKXLOuvMYfNyR++uQMMY4M5deRgm2w3AhMM/DP470k="; + sha256 = "sha256-h3jCqfAPg+z6vsdLm5Pdr+7PCEWW58GCG9viIz3Mi64="; }; # there is nothing to strip in this package