From 627c1199b5ea7d9788582420ed330db677785ea1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Oct 2022 10:51:01 +0200 Subject: [PATCH 01/11] python310Packages.aiounifi: 37 -> 38 --- 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 2ae3ef374eb5..c8f312b21d6b 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "37"; + version = "38"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VKR01lbXznkO/OQvvxvMJOjPIPSynLWT6G/YV4Essy0="; + hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ="; }; propagatedBuildInputs = [ From 9ddb8eead167fc3d06d0bdd1c0e380a256995179 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Oct 2022 00:02:15 +0200 Subject: [PATCH 02/11] python310Packages.bellows: 0.34.1 -> 0.34.2 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 8197b415c3bd..4e509e1b3c27 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.1"; + version = "0.34.2"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-a2skDJVqbct1+Ky2D8LXv8VMqFwqznUzXh+o+M6GtvQ="; + sha256 = "sha256-78LUQBFV4TFPDLiSHBG+RLnQLaCPX4LZpow9aszQAQA="; }; propagatedBuildInputs = [ From ffee5992374d3df89775f24f378a7f38af8d79cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 20:44:49 +0200 Subject: [PATCH 03/11] python310Packages.pydaikin: 2.7.0 -> 2.7.2 --- .../python-modules/pydaikin/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index adbb0d21a8c3..66608d7783cc 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,16 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.7.0"; + version = "2.7.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; + hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig="; }; propagatedBuildInputs = [ @@ -28,17 +30,15 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.7.0 - # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' - doCheck = false; - checkInputs = [ freezegun pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ "pydaikin" ]; + pythonImportsCheck = [ + "pydaikin" + ]; meta = with lib; { description = "Python Daikin HVAC appliances interface"; From 82f5c8d144c1083c88da125c1f611abab7bae240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 22:38:53 +0000 Subject: [PATCH 04/11] python310Packages.zigpy: 0.51.2 -> 0.51.3 --- 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 e8d846273c35..fbce8f8db61e 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.2"; + version = "0.51.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-6JHj75ntbW3Pu4P6/nw0/xhZ+fZCfpNCzB1ZB7WJ0jY="; + hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw="; }; propagatedBuildInputs = [ From 3c86ff131f97a7780fd7b44c1c668099c3e239e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 22:38:48 +0000 Subject: [PATCH 05/11] python310Packages.zigpy-xbee: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/zigpy-xbee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 1077703d1607..d484ac30a28d 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.16.0"; + version = "0.16.1"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-xbee"; - rev = version; - sha256 = "sha256-0Eg+XaMDEB3Zh0Ksn8Nsaf7AYdhRqzpscuZIz19DxCI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE="; }; buildInputs = [ From a6e0869512a850e3d7e6ea296ed2a1184d63ec4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 22:38:57 +0000 Subject: [PATCH 06/11] python310Packages.zigpy-zigate: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 74ec6a282477..c79efdf738ca 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/v${version}"; - hash = "sha256-JcKmLD3ET17PaNm1DoAV8TDMw88Qd5okDPOStLUqASM="; + hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ="; }; propagatedBuildInputs = [ From 6359a05f4d6e9116d361f775e708cbccdd479fdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Oct 2022 22:39:00 +0000 Subject: [PATCH 07/11] python310Packages.zigpy-znp: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 19b6d566a827..2b7fef4c8e27 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GvGWda+vsDwJrRIjc3hkl9zMrJ/cj2HGvHSeCROE69g="; + sha256 = "sha256-32QSFBzYg+E++5euCWKgbF3/uLEn1uObenmR/Wv9XZc="; }; propagatedBuildInputs = [ From 06c4dbb4cdcbd0ed7046dde3c655d228d6fe2fa5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 22:09:09 +0200 Subject: [PATCH 08/11] python3Packages.pyhumps: Fix regression in symbols export --- pkgs/development/python-modules/pyhumps/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 70366adaa406..87a9930ef3a2 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-7jkwf4qGQ+AD4/hOrEe/oAPY+gnSySUVBWFf70rU7xc="; }; + patches = [ + (fetchpatch { + # https://github.com/nficano/humps/pull/281 + url = "https://github.com/nficano/humps/commit/e248c26195804fa04c43e88c5682528f367e27b3.patch"; + hash = "sha256-+TCVfuMgfkDaS1tPu4q6PIOC3Kn1MBWyuoyAO6W0/h4="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; From 6992b0d15ec072518fdeb0e752b7aeea59667385 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 22:12:28 +0200 Subject: [PATCH 09/11] python3Packages.pyoverkiz: 1.5.4 -> 1.5.5 We can unpin pyhumps, because the offending behaviour is patched in our package. --- .../python-modules/pyoverkiz/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 78f864ef30bc..3eff84363102 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.5.4"; + version = "1.5.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+2L62GG9amP+0RROk9GzJqcaXsXCv+BMmMyUMH7VxYI="; + hash = "sha256-5HoCoVgq1pg+VxD324Fijosk2ln4sGE0oWpemFVAsfc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -45,11 +50,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' - ''; - pythonImportsCheck = [ "pyoverkiz" ]; From 4ad043f5f19d4ed913cee4980947984a01be031d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 22:30:30 +0200 Subject: [PATCH 10/11] home-assistant: 2022.10.1 -> 2022.10.2 https://github.com/home-assistant/core/releases/tag/2022.10.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 88d7a0ea3e02..70fe396b8381 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.10.1"; + version = "2022.10.2"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e2301323fc9f..4e7574744574 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -261,7 +261,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.10.1"; + hassVersion = "2022.10.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-+hf+Qjj/UrEJ8gHsaXZonKkANVJpjEsb5HoaSbsCFJ8="; + hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -302,6 +302,7 @@ in python.pkgs.buildPythonApplication rec { "orjson" "PyJWT" "requests" + "typing-extensions" "yarl" ]; in '' From 1c6a1eefe8188723f903ef218e368e706a188d1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 23:02:43 +0200 Subject: [PATCH 11/11] python3Packages.pymicrobot: 0.0.6 -> 0.0.8 --- pkgs/development/python-modules/pymicrobot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 5def66a11ef5..0923d8214c61 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-BvxF/9bnA0oXCAXq1GXoR7AUnPF9hQLxmlOHxfYX+u8="; + hash = "sha256-I4EkiG39v0yJXOAR7lmaqedLf9zHQCcxLXQ0nTfYq70="; }; propagatedBuildInputs = [