From f75ae44378c7e76e2396e58ba2afa0b53598d78e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 18:46:07 +0100 Subject: [PATCH 01/18] python311Packages.aioairzone-cloud: 0.3.0 -> 0.3.1 https://github.com/Noltari/aioairzone-cloud/releases/tag/0.3.1 --- .../python-modules/aioairzone-cloud/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 11ba9a203237..2325bf4ff0fc 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -4,13 +4,12 @@ , fetchFromGitHub , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.0"; - format = "pyproject"; + version = "0.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +17,11 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-tsx98DG/TvTrVwUy9fscErf+3zUC5XVs50lHKW/9pdQ="; + hash = "sha256-PWdyyzdPXDOfZgyLasT9TW+g+So2wOkcf9Fy77Oydl4="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ From 4e995d14fc9d57b102c89351cef3ed6a63508776 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Oct 2023 09:08:01 +0200 Subject: [PATCH 02/18] python311Packages.aiocomelit: 0.0.9 -> 0.3.0 Diff: https://github.com/chemelli74/aiocomelit/compare/refs/tags/v0.0.9...v0.3.0 Changelog: https://github.com/chemelli74/aiocomelit/blob/0.3.0/CHANGELOG.md --- pkgs/development/python-modules/aiocomelit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index f20d38b7266f..e413aca84766 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pint , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.0.9"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-xVSxXiHSyUa31X+eOK5ZXH/+Uwm8lfStY0nZ2mKWFpI="; + hash = "sha256-o8i1H4MsK21kJVbLD22PAUqj5Q9k31JfdZQYARPQICc="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pint ]; nativeCheckInputs = [ From c894753fb90b722319d17c141d157defc2f7dd94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Nov 2023 18:50:42 +0100 Subject: [PATCH 03/18] python311Packages.aiohomekit: 3.0.6 -> 3.0.8 (#262700) Diff: https://github.com/Jc2k/aiohomekit/compare/refs/tags/3.0.6...3.0.9 Changelog: - https://github.com/Jc2k/aiohomekit/releases/tag/3.0.8 - https://github.com/Jc2k/aiohomekit/releases/tag/3.0.9 --- 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 644c3cda0801..86c186f4220f 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.6"; + version = "3.0.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e7KSgUOEA3iAR4QdUhjYcHsPdtCJRxu6u+uxuDMaghQ="; + hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328="; }; nativeBuildInputs = [ From cd6dc98e8b90705fae847dcaaf5ff4b25da83174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Oct 2023 22:03:41 +0000 Subject: [PATCH 04/18] python311Packages.aiounifi: 63 -> 64 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 02e84b8f7e04..d07fbf7329ee 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "63"; + version = "64"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs="; + hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc="; }; postPatch = '' From fdbcae96424f260a40fa63325a7e1c944bc95f01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 18:52:35 +0100 Subject: [PATCH 05/18] python311Packages.aiovodafone: 0.3.1 -> 0.4.2 https://github.com/chemelli74/aiovodafone/blob/0.4.2/CHANGELOG.md --- pkgs/development/python-modules/aiovodafone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index ac9b87fb4eda..af193fa8dc69 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.3.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-Zitssjoe88T7gphfAQXyv2el7jbMLKTnr1GSe5LTWnI="; + hash = "sha256-sWONjWchXu5pRFXY/ZhOXvF0z/qUc1LjqcaSiVPA1MU="; }; postPatch = '' From 7fbf06ccace68da3ac1cb1841c4cfa418d9dfb2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Oct 2023 17:08:13 +0200 Subject: [PATCH 06/18] python311Packages.bleak-retry-connector: 3.2.1 -> 3.3.0 Diff: https://github.com/Bluetooth-Devices/bleak-retry-connector/compare/refs/tags/v3.2.1...v3.3.0 Changelog: https://github.com/bluetooth-devices/bleak-retry-connector/blob/v3.3.0/CHANGELOG.md --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 8ee08646d1e9..041fd9d84cff 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; + hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w="; }; postPatch = '' From 5b4858966bcc421fb3ac18ffaeb50238b1b8876a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 18:57:04 +0100 Subject: [PATCH 07/18] python311Package.blinkpy: 0.22.0 -> 0.22.2 https://github.com/fronzbot/blinkpy/blob/refs/tags/v0.22.2/CHANGES.rst --- pkgs/development/python-modules/blinkpy/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index f40eb9b0b44f..951acb313d15 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.0"; + version = "0.22.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I="; + hash = "sha256-T6ryiWVpraaXzwHYBXjuIO8PUqUcQBcLi1+O+iNBaoc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "wheel~=0.40.0"' "" + ''; + nativeBuildInputs = [ setuptools ]; From d835d8825c235b9135d4f7c791b6d23160b7c957 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:02:48 +0100 Subject: [PATCH 08/18] python311Packages.google-nest-sdm: 3.0.2 -> 3.0.3 https://github.com/allenporter/python-google-nest-sdm/releases/tag/3.0.3 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 7a2f0de78b21..31564a0536d9 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.2"; + version = "3.0.3"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk="; + hash = "sha256-VO/TY/QBzVFxqIumVJjw+Ic0hrqkRBS+7wQKBhcN9Jw="; }; propagatedBuildInputs = [ From 29f7506f5908f048a69f2a95e26388143a6bff41 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:05:19 +0100 Subject: [PATCH 09/18] python311Packages.hass-nabucasa: 0.71.0 -> 0.74.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.74.0 --- .../python-modules/hass-nabucasa/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index b93ddbaf1dfd..e27ef7ffce6b 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -4,12 +4,15 @@ , atomicwrites-homeassistant , attrs , buildPythonPackage +, ciso8601 +, cryptography , fetchFromGitHub , pycognito , pytest-aiohttp , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , snitun , syrupy , xmltodict @@ -17,16 +20,16 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.71.0"; - format = "setuptools"; + version = "0.74.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2v8LEVYY7PEzcIMaXcy9h+8O2KrU0zTKyZb2IrO35JQ="; + hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8="; }; postPatch = '' @@ -36,11 +39,17 @@ buildPythonPackage rec { --replace "snitun==" "snitun>=" \ ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ acme aiohttp atomicwrites-homeassistant attrs + ciso8601 + cryptography pycognito snitun ]; From 3ab075da2bda3473334c8e61e6c89974013a87aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:08:31 +0100 Subject: [PATCH 10/18] home-assistant.intents: 2023.10.2 -> 2023.10.16 https://github.com/home-assistant/intents-package/compare/refs/tags/2023.10.2...2023.10.16 --- 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 5f815628a50f..52d9f622c41b 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.10.2"; + version = "2023.10.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk="; + hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; fetchSubmodules = true; }; From eda0545f6a7999321830427d0fc9d4bf7bdb3258 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:15:39 +0100 Subject: [PATCH 11/18] python311Packages.mastodon-py: unstable-2023-06-24 -> 1.8.1 https://github.com/halcy/Mastodon.py/blob/1.8.1/CHANGELOG.rst --- .../python-modules/mastodon-py/default.nix | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index 59119e0b8a97..5034346b9cfe 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -7,7 +7,6 @@ , http-ece , python-dateutil , python-magic -, pytz , requests , six , pytestCheckHook @@ -15,42 +14,60 @@ , pytest-vcr , requests-mock , setuptools -, pytest-cov }: buildPythonPackage rec { pname = "mastodon-py"; - # tests are broken on last release, check after next release (> 1.8.1) - version = "unstable-2023-06-24"; - - format = "pyproject"; + version = "1.8.1"; + pyproject = true; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; - rev = "cd86887d88bbc07de462d1e00a8fbc3d956c0151"; - hash = "sha256-rJocFvtBPrSSny3lwENuRsQdAzi3u8b+SfDNGloniWI="; + rev = "refs/tags/${version}"; + hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218="; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ blurhash - cryptography decorator - http-ece python-dateutil python-magic - pytz requests six ]; + passthru.optional-dependencies = { + blurhash = [ + blurhash + ]; + webpush = [ + http-ece + cryptography + ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-vcr - pytest-cov requests-mock setuptools + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + disabledTests = [ + "test_notifications_dismiss_pre_2_9_2" + "test_status_card_pre_2_9_2" + "test_stream_user_direct" + "test_stream_user_local" ]; pythonImportsCheck = [ "mastodon" ]; From 3086b37cc066fd25ea39d7e6a76365d3a9c31345 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:34:06 +0100 Subject: [PATCH 12/18] python311Packages.matrix-nio: 0.21.2 -> 0.22.1 https://github.com/poljar/matrix-nio/blob/0.22.1/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 77f47543c52a..db6b13b0fcc3 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.21.2"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0="; + hash = "sha256-hFSS2Nys95YJgBNED8SBan24iRo2q/UOr6pqUPAF5Ms="; }; postPatch = '' From 545c6c0bc493f5f600b3bd5c645b627d49b98c2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:43:01 +0100 Subject: [PATCH 13/18] python311Packages.pyatv: 0.13.4 -> 0.14.4 https://github.com/postlund/pyatv/blob/v0.14.4/CHANGES.md --- .../python-modules/pyatv/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 7401af8e47d3..b5785dfd3f2e 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage , aiohttp -, bitarray +, async-timeout , chacha20poly1305-reuseable , cryptography , deepdiff , fetchFromGitHub +, ifaddr , mediafile , miniaudio -, netifaces , protobuf +, pydantic +, pyfakefs , pytest-aiohttp , pytest-asyncio , pytest-httpserver @@ -18,23 +20,25 @@ , pythonRelaxDepsHook , pythonOlder , requests +, setuptools , srptools , stdenv +, tabulate , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.4"; - format = "setuptools"; + version = "0.14.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "postlund"; - repo = pname; + repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw="; + hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; }; postPatch = '' @@ -59,24 +63,28 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ aiohttp - bitarray + async-timeout chacha20poly1305-reuseable cryptography + ifaddr mediafile miniaudio - netifaces protobuf + pydantic requests srptools + tabulate zeroconf ]; nativeCheckInputs = [ deepdiff + pyfakefs pytest-aiohttp pytest-asyncio pytest-httpserver @@ -84,10 +92,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" From 135d9b4a6787faa200bcc207df3f77e609da2d09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Oct 2023 13:14:31 +0200 Subject: [PATCH 14/18] python311Packages.python-opensky: 0.2.1 -> 0.2.1 Diff: https://github.com/joostlek/python-opensky/compare/refs/tags/v0.2.1...v0.2.1 Changelog: https://github.com/joostlek/python-opensky/releases/tag/v0.2.1 --- pkgs/development/python-modules/python-opensky/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 40974345dcfd..0f23163d9aff 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -8,12 +8,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "python-opensky"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-62ncinv6XUGB1dYle/yqSCyJNbGD9BLaOqrF/zjL2fA="; + hash = "sha256-xNXFvCUZ/x5ox3KxmG3eA73wpX4fwhvAVmlfcKiT1V8="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ From cb7df2351aeacf91c913f6b0d00308e0c6bc5c18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Nov 2023 19:46:33 +0100 Subject: [PATCH 15/18] python311Packages.zeroconf: 0.115.2 -> 0.119.0 (#260837) Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.115.2...0.119.0 Changelog: - https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.116.0 - https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.117.0 - https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.118.0 - https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.118.1 - https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.119.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a26d45415eae..7c2cf10e5daf 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.115.2"; + version = "0.119.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-qLJWOZyWyLx5orDbvVSluA+zFvHN2393hyVC3ty87ug="; + hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4="; }; nativeBuildInputs = [ From 6b4b15b6e0f38d36f912f53847d45df82fa99532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Oct 2023 05:04:27 +0000 Subject: [PATCH 16/18] python311Packages.zigpy: 0.57.2 -> 0.58.1 https://github.com/zigpy/zigpy/releases/tag/0.58.0 https://github.com/zigpy/zigpy/releases/tag/0.58.1 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dde789fd289c..1f6560377ea7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.2"; + version = "0.58.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-v4H8syWbXqmfvOznRECgSjYi246+socPJTffb79MXK4="; + hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY="; }; postPatch = '' From 0b2ab262bc4d935039fd392b43e94e63c18bf5ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 19:51:59 +0100 Subject: [PATCH 17/18] home-assistant: 2023.10.5 -> 2023.11.0 https://www.home-assistant.io/blog/2023/11/01/release-202311/ --- .../home-automation/home-assistant.nix | 1 + .../home-assistant/component-packages.nix | 96 ++++++++++++++----- pkgs/servers/home-assistant/default.nix | 26 +---- pkgs/servers/home-assistant/frontend.nix | 4 +- 4 files changed, 76 insertions(+), 51 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0e6fa65667af..789b06af19b1 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -455,6 +455,7 @@ in { "govee_ble" "homekit_controller" "inkbird" + "improv_ble" "keymitt_ble" "led_ble" "medcom_ble" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d1ebe9fefa17..60248f80d7b1 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.10.5"; + version = "2023.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -682,6 +682,8 @@ "cpuspeed" = ps: with ps; [ py-cpuinfo ]; + "cribl" = ps: with ps; [ + ]; "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud @@ -944,6 +946,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "eastron" = ps: with ps; [ + ]; "easyenergy" = ps: with ps; [ easyenergy ]; @@ -984,7 +988,6 @@ pythonegardia ]; "eight_sleep" = ps: with ps; [ - pyeight ]; "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra @@ -1245,6 +1248,9 @@ "fitbit" = ps: with ps; [ aiohttp-cors fitbit + fnv-hash-fast + psutil-home-assistant + sqlalchemy ]; "fivem" = ps: with ps; [ fivem-api @@ -1538,6 +1544,13 @@ psutil-home-assistant sqlalchemy ]; + "google_tasks" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "google_translate" = ps: with ps; [ gtts ]; @@ -1959,10 +1972,31 @@ aiohttp-cors aioimaplib ]; - "imap_email_content" = ps: with ps; [ + "improv_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors - aioimaplib - ]; + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: py-improv-ble-client "incomfort" = ps: with ps; [ incomfort-client ]; @@ -2370,6 +2404,9 @@ psutil-home-assistant sqlalchemy ]; + "local_todo" = ps: with ps; [ + ical + ]; "locative" = ps: with ps; [ aiohttp-cors ]; @@ -3241,6 +3278,8 @@ "poolsense" = ps: with ps; [ poolsense ]; + "portlandgeneral" = ps: with ps; [ + ]; "powerwall" = ps: with ps; [ tesla-powerwall ]; @@ -3332,6 +3371,7 @@ ]; "python_script" = ps: with ps; [ restrictedpython + restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -3464,6 +3504,21 @@ psutil-home-assistant sqlalchemy ]; + "recovery_mode" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + hass-nabucasa + hassil + home-assistant-frontend + home-assistant-intents + janus + mutagen + pillow + psutil-home-assistant + pyturbojpeg + sqlalchemy + webrtc-noise-gain + ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ @@ -3617,21 +3672,6 @@ "sabnzbd" = ps: with ps; [ pysabnzbd ]; - "safe_mode" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - hass-nabucasa - hassil - home-assistant-frontend - home-assistant-intents - janus - mutagen - pillow - psutil-home-assistant - pyturbojpeg - sqlalchemy - webrtc-noise-gain - ]; "saj" = ps: with ps; [ pysaj ]; @@ -3829,9 +3869,6 @@ pyudev sqlalchemy ]; - "shiftr" = ps: with ps; [ - paho-mqtt - ]; "shodan" = ps: with ps; [ shodan ]; @@ -4208,6 +4245,8 @@ "tailscale" = ps: with ps; [ tailscale ]; + "tami4" = ps: with ps; [ + ]; # missing inputs: Tami4EdgeAPI "tank_utility" = ps: with ps; [ tank-utility ]; @@ -4390,6 +4429,9 @@ ]; "tod" = ps: with ps; [ ]; + "todo" = ps: with ps; [ + aiohttp-cors + ]; "todoist" = ps: with ps; [ todoist-api-python ]; @@ -4733,6 +4775,7 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiowithings fnv-hash-fast hass-nabucasa hassil @@ -4742,7 +4785,6 @@ pyturbojpeg sqlalchemy webrtc-noise-gain - withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors @@ -5231,6 +5273,7 @@ "google_mail" "google_pubsub" "google_sheets" + "google_tasks" "google_translate" "google_travel_time" "google_wifi" @@ -5290,7 +5333,6 @@ "image_processing" "image_upload" "imap" - "imap_email_content" "influxdb" "inkbird" "input_boolean" @@ -5347,6 +5389,7 @@ "local_calendar" "local_file" "local_ip" + "local_todo" "locative" "lock" "logbook" @@ -5518,6 +5561,7 @@ "rdw" "recollect_waste" "recorder" + "recovery_mode" "reddit" "remote" "renault" @@ -5544,7 +5588,6 @@ "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" - "safe_mode" "samsungtv" "scene" "schedule" @@ -5657,6 +5700,7 @@ "time_date" "timer" "tod" + "todo" "todoist" "tolo" "tomato" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5f4ee05a7327..d0ca426a0144 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,26 +67,6 @@ let ]; }); - blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec { - version = "0.21.0"; - src = fetchFromGitHub { - owner = "fronzbot"; - repo = "blinkpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; - }; - }); - - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { - version = "0.33"; - src = fetchFromGitHub { - owner = "ndokter"; - repo = "dsmr_parser"; - rev = "refs/tags/v${version}"; - hash = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w="; - }; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -385,7 +365,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.5"; + hassVersion = "2023.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -401,7 +381,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA="; + hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q="; }; # Secondary source is git for tests @@ -409,7 +389,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk="; + hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index da86e1c698ca..ae2ef5624409 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 = "20231005.0"; + version = "20231030.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-p93bo5+VQykcuK5f0r848tMoANSexvHDVBm7f3IYOMM="; + hash = "sha256-S363j7HnOxLqCBaml1Kb9xfY0AaqBIgj09NutByn6Xo="; }; # there is nothing to strip in this package From a7e65a9e76f582d011883f6d40715f98c2626de5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Nov 2023 22:49:50 +0100 Subject: [PATCH 18/18] python311Packages.zha-quirks: test with pytest-asyncio Previously alot of tests were skipped. --- pkgs/development/python-modules/zha-quirks/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b7e0608428ff..a8959a9e863b 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , zigpy @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ];