From e9476f7925a2fddfda85720c3ee246ed4ed26fa9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 19:20:39 +0200 Subject: [PATCH 01/20] python3Packages.aioairzone: 0.3.4 -> 0.4.2 --- 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 fc62525915e..4865812023b 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.3.4"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk="; + hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo="; }; propagatedBuildInputs = [ From 9a99c65217fc31ad53780e4ccaf6bab7bcda042c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:10:59 +0200 Subject: [PATCH 02/20] python3Packages.aioslimproto: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/aioslimproto/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 50f8ed56404..2990659556c 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,13 +16,18 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-7xFbxWay2aPCBkf3pBUGshROtssbi//PxxsI8ELeS+c="; + hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0="; }; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50'] + "test_msg_instantiation" + ]; + pythonImportsCheck = [ "aioslimproto" ]; From 44f8ea01e05a401439d4bef083ad96af52c7201f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Apr 2022 22:34:00 +0200 Subject: [PATCH 03/20] python3Packages.androidtv: 0.0.66 -> 0.0.67 --- pkgs/development/python-modules/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index f116cef3dc7..2f7afc11375 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.66"; + version = "0.0.67"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo="; + hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0="; }; propagatedBuildInputs = [ From c38b06a3dc4ca2118aa183a62b73dac0393daa0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:14:59 +0200 Subject: [PATCH 04/20] python3Packages.async-upnp-client: 0.28.0 -> 0.29.0 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index f2fc5b855c1..c80c2646b7d 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.28.0"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY="; + sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA="; }; propagatedBuildInputs = [ From 24971206cb21a0fe262b4a6d384b5c6f6c0ed3a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Apr 2022 11:59:08 +0000 Subject: [PATCH 05/20] python310Packages.pydeconz: 87 -> 90 --- pkgs/development/python-modules/pydeconz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 8d37521f326..fdab2c925ca 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "87"; + version = "90"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; - rev = "v${version}"; - sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DojTqgv3Dr+th2n/gPM70r/5QE487OgyYOBVxVzvcXE="; }; propagatedBuildInputs = [ From f12a40ff5851af9e88c86b4252fe83dfa4968be0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Apr 2022 09:55:28 +0200 Subject: [PATCH 06/20] python3Packages.pyevilgenius: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/pyevilgenius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyevilgenius/default.nix b/pkgs/development/python-modules/pyevilgenius/default.nix index 28bb1a2c4c0..b59f2ad4fe9 100644 --- a/pkgs/development/python-modules/pyevilgenius/default.nix +++ b/pkgs/development/python-modules/pyevilgenius/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyevilgenius"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3"; + sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o="; }; propagatedBuildInputs = [ From f5b90ecc8d3cdb14bce7c88591c5d2e3dc6bcbb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 May 2022 13:14:40 +0000 Subject: [PATCH 07/20] python310Packages.pyinsteon: 1.0.16 -> 1.1.0 --- pkgs/development/python-modules/pyinsteon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 0dc1c5be49c..ed28f1c7522 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.16"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc="; + rev = "refs/tags/${version}"; + hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c="; }; propagatedBuildInputs = [ From ed5b29c1cd7f1098b277add00065715fa4da9cfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 07:30:31 +0000 Subject: [PATCH 08/20] python310Packages.pynws: 1.3.2 -> 1.4.1 --- pkgs/development/python-modules/pynws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index df258cad930..eb19d273459 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.3.2"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MatthewFlamm"; repo = pname; rev = "v${version}"; - sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1"; + sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y="; }; propagatedBuildInputs = [ From f4c6bea09d5ff7defe4896fd9bf9ced7f5576c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 23 Apr 2022 21:38:57 +0000 Subject: [PATCH 09/20] python3Packages.pytomorrowio: 0.2.1 -> 0.3.3 --- pkgs/development/python-modules/pytomorrowio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 2c695fc7e05..abc90f2a6c7 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -3,19 +3,20 @@ , pythonOlder , fetchPypi , aiohttp +, pytest-aiohttp , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.2.1"; + version = "0.3.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e"; + sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62"; }; propagatedBuildInputs = [ @@ -23,6 +24,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-aiohttp pytest-asyncio pytestCheckHook ]; From b1a2be803664a1acffdfde452789ec677c026211 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:31:55 +0200 Subject: [PATCH 10/20] python3Packages.simplisafe-python: 2022.03.3 -> 2022.5.0 --- .../python-modules/simplisafe-python/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index ec3cf592786..cb3446156bf 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -3,6 +3,7 @@ , aresponses , asynctest , backoff +, beautifulsoup4 , buildPythonPackage , docutils , fetchFromGitHub @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.03.3"; + version = "2022.05.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw="; + sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backoff + beautifulsoup4 docutils pytz voluptuous @@ -62,6 +64,8 @@ buildPythonPackage rec { # simplipy/api.py:253: InvalidCredentialsError "test_request_error_failed_retry" "test_update_error" + # ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution] + "test_client_async_from_refresh_token_unknown_error" ]; disabledTestPaths = [ From fc3ed4e81c6b78dbc4500035540d2e4f5b20de27 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:38:11 +0200 Subject: [PATCH 11/20] python3Packages.zigpy: 0.44.2 -> 0.45.1 --- pkgs/development/python-modules/zigpy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index a10e9ae65c7..da0ae7872da 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -4,6 +4,7 @@ , asynctest , buildPythonPackage , crccheck +, cryptography , fetchFromGitHub , pycryptodome , pytest-aiohttp @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.44.2"; + version = "0.45.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,13 +25,14 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I="; + sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE="; }; propagatedBuildInputs = [ aiohttp aiosqlite crccheck + cryptography pycryptodome voluptuous ]; From 8006deeb3c9a5bdeaae390c6a25b06e5c9f72b3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:39:14 +0200 Subject: [PATCH 12/20] python3Packages.zwave-js-server-python: 0.35.3 -> 0.36.1 --- .../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 028e30f4cb7..d0f938c6a8b 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.35.3"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8="; + sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc="; }; propagatedBuildInputs = [ From f58df705e7c65b58e2c3aa0b6309cf7418bc169c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Apr 2022 21:21:36 +0200 Subject: [PATCH 13/20] python3Packages.voluptuous: 0.13.0 -> 0.13.1 --- .../python-modules/voluptuous/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index d2e221d6e39..4212de031be 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,27 +1,31 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "voluptuous"; - version = "0.13.0"; + version = "0.13.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY="; + src = fetchFromGitHub { + owner = "alecthomas"; + repo = pname; + rev = version; + hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; }; checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ + "voluptuous" + ]; - pythonImportsCheck = [ "voluptuous" ]; + pytestFlagsArray = [ + "voluptuous/tests/" + ]; meta = with lib; { description = "Python data validation library"; From db3a1b15de3094bfccb05afaeb99b4e83b7cd51b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Apr 2022 09:47:10 +0000 Subject: [PATCH 14/20] python310Packages.PyChromecast: 11.0.0 -> 12.0.0 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 32462707cb6..27e464f6e5f 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "11.0.0"; + version = "12.0.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY="; + sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4="; }; propagatedBuildInputs = [ From 2401e18f68453c8752a3f1fad7ad471c0dac3388 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 22:55:04 +0200 Subject: [PATCH 15/20] python3Packages.total-connect-client: 2022.2.1 -> 2022.3 --- .../python-modules/total-connect-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 7846525f65f..24d2093a59d 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.2.1"; + version = "2022.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY="; + hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk="; }; propagatedBuildInputs = [ From 440f2e1de28ddb442c9f4298246d6bc05c1d3a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 May 2022 20:54:27 +0000 Subject: [PATCH 16/20] python3Packages.pydeconz: 90 -> 91 https://github.com/Kane610/deconz/releases/tag/v91 --- pkgs/development/python-modules/pydeconz/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index fdab2c925ca..8523fd96f64 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aioresponses +, async-timeout , buildPythonPackage , fetchFromGitHub , pytest-aiohttp @@ -10,20 +11,21 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "90"; + version = "91"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DojTqgv3Dr+th2n/gPM70r/5QE487OgyYOBVxVzvcXE="; + hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ="; }; propagatedBuildInputs = [ aiohttp + async-timeout ]; checkInputs = [ From 9170fcf74fa760c0f30ad207b3049047075e1652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 May 2022 21:21:21 +0000 Subject: [PATCH 17/20] python3Packages.gcal-sync: init at 0.7.1 --- .../python-modules/gcal-sync/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/gcal-sync/default.nix diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix new file mode 100644 index 00000000000..101a3ef53d6 --- /dev/null +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, pydantic +, freezegun +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gcal-sync"; + version = "0.7.1"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "gcal_sync"; + rev = version; + hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gcal_sync" ]; + + meta = { + description = "Python library for syncing Google Calendar to local storage"; + homepage = "https://github.com/allenporter/gcal_sync"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 032349a2d49..f632a1200e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3268,6 +3268,8 @@ in { gbulb = callPackage ../development/python-modules/gbulb { }; + gcal-sync = callPackage ../development/python-modules/gcal-sync { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; From f886c041ca72d7f32ae9953574231aafe3f73ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 May 2022 21:37:54 +0000 Subject: [PATCH 18/20] python3Packages.insteon-frontend-home-assistant: init at 0.1.0 --- .../default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix new file mode 100644 index 00000000000..646ffec6552 --- /dev/null +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "insteon-frontend-home-assistant"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf"; + }; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "insteon_frontend" ]; + + meta = { + description = "The Insteon frontend for Home Assistant"; + homepage = "https://github.com/teharris1/insteon-panel"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f632a1200e3..5f830e5a347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4150,6 +4150,8 @@ in { installer = callPackage ../development/python-modules/installer { }; + insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { }; + intake = callPackage ../development/python-modules/intake { }; intake-parquet = callPackage ../development/python-modules/intake-parquet { }; From 5aad723328210a7e2dfc7fcca89291cbe291bf16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 21:44:09 +0200 Subject: [PATCH 19/20] home-assistant: 2022.4.7 -> 2022.5.0 https://www.home-assistant.io/blog/2022/05/04/release-20225/ --- .../home-assistant/component-packages.nix | 47 +++++++++++++------ pkgs/servers/home-assistant/default.nix | 7 ++- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 963f81c1daf..707740cd4a4 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 = "2022.4.7"; + version = "2022.5.0"; components = { "abode" = ps: with ps; [ abodepy @@ -157,10 +157,6 @@ ]; "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ - ha-ffmpeg - pyarlo - ]; "arris_tg2492lg" = ps: with ps; [ arris-tg2492lg ]; @@ -554,8 +550,6 @@ "digital_ocean" = ps: with ps; [ digital-ocean ]; - "digitalloggers" = ps: with ps; [ - ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; @@ -993,8 +987,7 @@ ]; "google" = ps: with ps; [ aiohttp-cors - google-api-python-client - httplib2 + gcal-sync oauth2client ]; "google_assistant" = ps: with ps; [ @@ -1248,9 +1241,15 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors + fnvhash + home-assistant-frontend + insteon-frontend-home-assistant + lru-dict + pillow pyinsteon pyserial pyudev + sqlalchemy ]; "integration" = ps: with ps; [ ]; @@ -1391,8 +1390,10 @@ life360 ]; "lifx" = ps: with ps; [ + aiohttp-cors aiolifx aiolifx-effects + ifaddr ]; "lifx_cloud" = ps: with ps; [ ]; @@ -1514,6 +1515,8 @@ "mazda" = ps: with ps; [ pymazda ]; + "meater" = ps: with ps; [ + ]; # missing inputs: meater-python "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light @@ -2088,6 +2091,9 @@ ]; "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats + "qnap_qsw" = ps: with ps; [ + aioqsw + ]; "qrcode" = ps: with ps; [ pillow pyzbar @@ -2309,6 +2315,10 @@ "sentry" = ps: with ps; [ sentry-sdk ]; + "senz" = ps: with ps; [ + aiohttp-cors + aiosenz + ]; "serial" = ps: with ps; [ pyserial-asyncio ]; @@ -2382,6 +2392,10 @@ ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api + "slimproto" = ps: with ps; [ + aiohttp-cors + aioslimproto + ]; "sma" = ps: with ps; [ pysma ]; @@ -2420,7 +2434,7 @@ paho-mqtt ]; "snmp" = ps: with ps; [ - pysnmp + pysnmplib ]; "solaredge" = ps: with ps; [ solaredge @@ -2747,6 +2761,9 @@ pytradfri ] ++ pytradfri.extras-require.async; + "trafikverket_ferry" = ps: with ps; [ + pytrafikverket + ]; "trafikverket_train" = ps: with ps; [ pytrafikverket ]; @@ -2828,11 +2845,10 @@ ]; "update" = ps: with ps; [ ]; - "updater" = ps: with ps; [ - ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client + getmac ifaddr zeroconf ]; @@ -3168,7 +3184,6 @@ "apprise" "aprs" "arcam_fmj" - "arlo" "aseko_pool_live" "asuswrt" "atag" @@ -3540,6 +3555,7 @@ "pvpc_hourly_pricing" "python_script" "qld_bushfire" + "qnap_qsw" "rachio" "radarr" "radio_browser" @@ -3582,6 +3598,7 @@ "sensibo" "sensor" "sentry" + "senz" "seventeentrack" "shell_command" "shelly" @@ -3595,6 +3612,7 @@ "siren" "slack" "sleepiq" + "slimproto" "sma" "smappee" "smart_meter_texas" @@ -3648,6 +3666,7 @@ "tailscale" "tankerkoenig" "tasmota" + "tautulli" "tcp" "telegram" "telegram_bot" @@ -3671,6 +3690,7 @@ "trace" "tractive" "tradfri" + "trafikverket_ferry" "trafikverket_train" "trafikverket_weatherstation" "transmission" @@ -3689,7 +3709,6 @@ "upb" "upcloud" "update" - "updater" "upnp" "uptime" "uptimerobot" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b29f48310d0..f72f62d01fb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -30,7 +30,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") - (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=") # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { @@ -110,7 +109,7 @@ let src = fetchFromGitHub { owner = "ManneW"; repo = "vilfo-api-client-python"; - rev = "v$version}"; + rev = "v${version}"; sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; }; }); @@ -168,7 +167,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.4.7"; + hassVersion = "2022.5.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -186,7 +185,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M="; + hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY="; }; # 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 fb708313072..98fe3a04e2b 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 = "20220405.0"; + version = "20220504.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg="; + sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog="; }; # there is nothing to strip in this package From 11ca7ae7e12f602a2c9aef1142c6ca79d0e2501d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 May 2022 22:49:24 +0200 Subject: [PATCH 20/20] home-assistant: disable more dependency tests More victims of home-assistants pytest-aiohttp pin. --- pkgs/servers/home-assistant/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f72f62d01fb..b7d0faca0c1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -46,9 +46,21 @@ let aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + pynws = super.pynws.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 });