From a6a2c08632df3800b42b18ff04a0f1be440331bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Jan 2023 22:25:59 +0100 Subject: python310Packages.adguardhome: add changelog to meta --- pkgs/development/python-modules/adguardhome/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index 134132f9931e4..f1cedde2b1fb3 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -14,13 +14,14 @@ buildPythonPackage rec { pname = "adguardhome"; version = "0.5.1"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; + rev = "refs/tags/v${version}"; + hash = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; }; postPatch = '' @@ -32,7 +33,9 @@ buildPythonPackage rec { --replace 0.0.0 ${version} ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -45,11 +48,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "adguardhome" ]; + pythonImportsCheck = [ + "adguardhome" + ]; meta = with lib; { description = "Python client for the AdGuard Home API"; homepage = "https://github.com/frenck/python-adguardhome"; + changelog = "https://github.com/frenck/python-adguardhome/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; -- cgit 1.4.1 From 057b6e8c5a93550775e63dc8688220794bf10f75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Jan 2023 22:27:16 +0100 Subject: python310Packages.adguardhome: 0.5.1 -> 0.6.1 Changelog: https://github.com/frenck/python-adguardhome/releases/tag/v0.6.1 --- pkgs/development/python-modules/adguardhome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index f1cedde2b1fb3..500fb1fb9b9fc 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.5.1"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; + hash = "sha256-ZeajC8FM7Py+DWknVjnwiM4jaCCcnxfC+kTbHEEmyms="; }; postPatch = '' -- cgit 1.4.1 From 98c92e795050e2484f07f91b4387500a95472281 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 22:09:56 +0100 Subject: python3Packages.async-upnp-client: 0.32.3 -> 0.33.0 Diff: https://github.com/StevenLooman/async_upnp_client/compare/refs/tags/0.32.3...0.33.0 Changelog: https://github.com/StevenLooman/async_upnp_client/blob/0.33.0/CHANGES.rst --- 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 451ac4ed221fb..5299ad46e5057 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.32.3"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-1/RW84ammc6mu90izMtL7Cv11krc4WhdqCSq9ncFibI="; + hash = "sha256-I7C2ho+pmowerJFK82wYcqEOhRV3KZ5j5IBVCKjhllM="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 10140fc79f5a79d9d4b71b7bdadc5b87a7593191 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:12:59 +0100 Subject: python3Packages.bthome-ble: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5831ea18ee33d..8e25f403a5e8d 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.3.1"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4KsMYQQN/4A2sbk2Fj8CYOBf7/UAciJ4wTSFYZaCfdk="; + hash = "sha256-BLRXoKZkSWgzGIztwmO8El8pF25QBrTEX05FWXZrHxc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 0c1f9a789dcb451d5bf6b09668b5ae917e0ec14d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:16 +0100 Subject: python3Packages.govee-ble: 0.19.3 -> 0.21.0 --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 7cee9b5713e77..abbac7610982f 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.19.3"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HoEWFwpEzlTVlCD1sPOSKhvZleErxJdaqxKPv+1PcGo="; + hash = "sha256-BObJQTt1l+fFh02/zhcKRNRs0LQl+oJelMQq9EW2XuY="; }; nativeBuildInputs = [ -- cgit 1.4.1 From c8f87304cb7410d591638ad8d71637a5e25df36e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 22:14:33 +0100 Subject: python3Packages.pydeconz: 105 -> 106 Diff: https://github.com/Kane610/deconz/compare/refs/tags/v105...v106 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index c81c42d47707b..86265aebbcb72 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "105"; + version = "106"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE="; + hash = "sha256-13of5ohz/hezlmGvSNqCu9QoOPKdPPtrhQHbxmG2/Do="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 3db8d1093c1b6fe97478916e0c734af160268e60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 22:15:14 +0100 Subject: python3Packages.pyisy: 3.0.9 -> 3.0.10 Diff: https://github.com/automicus/PyISY/compare/refs/tags/v3.0.9...v3.0.10 Changelog: https://github.com/automicus/PyISY/releases/tag/v3.0.10 --- pkgs/development/python-modules/pyisy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index de4373dff41f0..33a47238b36f5 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.9"; + version = "3.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-95MUOxWR4YUce0fFcasKc6YjoSHTGhXJcUAg0mbXxCs="; + hash = "sha256-nThHJYU23I9q5Irk5SoW1+dy5Agl9IJc5gnLirzp3YM="; }; postPatch = '' -- cgit 1.4.1 From 7d7fb2d1ae3e2bd497c70b440f11e67babc7c59a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Dec 2022 23:48:28 +0100 Subject: python310Packages.pynina: 0.1.8 -> 0.2.0 --- pkgs/development/python-modules/pynina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index be81bd6e6557a..1d6376d0af69c 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.8"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "sha256-U8/SzkkZJLRBpTQx8NRpFWUlckn4Jr0n9cHR4/plyb0="; + hash = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 579e34761fbf6b4cab30e51f27912c6cd5e3037d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Dec 2022 13:39:30 +0100 Subject: python310Packages.pyswitchbee: 1.6.2 -> 1.7.3 Changelog: https://github.com/jafar-atili/pySwitchbee/releases/tag/1.7.3 --- pkgs/development/python-modules/pyswitchbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 58466f0d9b809..47614cffdfdbb 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.6.2"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-MDutpeHI6MW1VwCRTPJK/y08ee4eidOHluMf6lPQfEk="; + hash = "sha256-M3sxxBp4IoqZLX9Lyw35Z0zkV6fDT7AkeDOcdPN5k7w="; }; postPatch = '' -- cgit 1.4.1 From 2fce4aacf962ad98415a7cf031c403d200f61eca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:39 +0100 Subject: python3Packages.pyswitchbot: 0.30.1 -> 0.36.1 --- pkgs/development/python-modules/pyswitchbot/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 8100fcea5157b..df5cf9d796077 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -1,15 +1,18 @@ { lib , bleak , bleak-retry-connector +, boto3 , buildPythonPackage +, cryptography , fetchFromGitHub , pythonOlder , pytestCheckHook +, requests }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.30.1"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +21,15 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-5Rn1hQ1TZhRiCJGJCaA1sl+HnerL/oOhRdMiSl1Recg="; + hash = "sha256-eXCHmtdizRJJdwFeZU0yLi8NWwMqbET6ZItQQClYVI4="; }; propagatedBuildInputs = [ bleak bleak-retry-connector + boto3 + cryptography + requests ]; checkInputs = [ -- cgit 1.4.1 From 8003208e5e852e2ae1c4da61fd38d846d950eeac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:55 +0100 Subject: python3Packages.vallox-websocket-api: 2.12.0 -> 3.0.0 --- .../python-modules/vallox-websocket-api/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 821dbb19e6358..8e760921ba28e 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , construct , websockets , asynctest @@ -10,19 +11,22 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "2.12.0"; + version = "3.0.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; - format = "setuptools"; - src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20="; + hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct websockets -- cgit 1.4.1 From 1e5360086446b8cd30c423344e53ddb7cb66fd7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:57 +0100 Subject: python3Packages.xknx: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 2f3a3768331fa..9d97d0268edcd 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a8hC63G+FZBe6yePgrmzRsRTzpHWS+tBQmVUS/uHfzI="; + hash = "sha256-vz24saI0wuhax4/zCBDM3HB+ZjZI8bGOWr2va4V3zV8="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 85031c93345540355f9ab621afb4d638271737b8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Dec 2022 20:13:58 +0100 Subject: python3Packages.zeroconf: 0.39.4 -> 0.47.1 --- pkgs/development/python-modules/zeroconf/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 6bc6b7888d8c5..a65e485004a89 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -4,15 +4,17 @@ , buildPythonPackage , fetchFromGitHub , ifaddr +, poetry-core , pytest-asyncio , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.4"; - format = "setuptools"; + version = "0.47.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +22,14 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-CUHpTtCQBuuy8E8bjxfhGOIKr9n2Gdhg/RIyv6OWGvI="; + hash = "sha256-vY4n0QIEzumtUayRbGGqycR3z7kpbOH4XKxSMcnTVrA="; }; + nativeBuildInputs = [ + poetry-core + setuptools + ]; + propagatedBuildInputs = [ async-timeout ifaddr @@ -36,6 +43,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + disabledTests = [ # tests that require network interaction "test_close_multiple_times" @@ -58,6 +69,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21Only; -- cgit 1.4.1 From f7344bdd9aa16ebf1bf668d7a92e2620a110fc44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 22:28:15 +0100 Subject: python3Packages.zwave-js-server-python: 0.43.1 -> 0.44.0 Diff: https://github.com/home-assistant-libs/zwave-js-server-python/compare/refs/tags/0.43.1...0.44.0 --- pkgs/development/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 42aaaa4d13e19..1f18447ee7221 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.43.1"; + version = "0.44.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qnGMUY7c2jqLQbVybVdu9vWcPMFoxCnCCTBhWP+AXE0="; + hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 4920c82507516619d95c105df497068dedb12572 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 Jan 2023 01:04:10 +0100 Subject: home-assistant: relax ciso8601, overrride astral --- pkgs/servers/home-assistant/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c09ecc6fb49d0..9b7f66f4a0200 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -43,6 +43,22 @@ let }; }); + astral = super.astral.overridePythonAttrs (oldAttrs: rec { + pname = "astral"; + version = "2.2"; + src = self.fetchPypi { + inherit pname version; + hash = "sha256-5B2ZZ9XEi+QhNGVS8PTe2tQ/85qDV09f8q0ytmJ7b74="; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry" "poetry.core.masonry" + ''; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + self.pytz + ]; + }); + caldav = super.caldav.overridePythonAttrs (old: rec { version = "0.9.1"; src = fetchFromGitHub { @@ -225,6 +241,7 @@ in python.pkgs.buildPythonApplication rec { "attrs" "awesomeversion" "bcrypt" + "ciso8601" "cryptography" "home-assistant-bluetooth" "httpx" -- cgit 1.4.1 From 1d06a93281dd633846f178c9e120546c621e7465 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:02:56 +0100 Subject: python3Packages.odp-amsterdam: init at 5.0.0 Renamed from garages-amsterdam. --- .../python-modules/garages-amsterdam/default.nix | 49 ------------------- .../python-modules/odp-amsterdam/default.nix | 57 ++++++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +- 4 files changed, 60 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/garages-amsterdam/default.nix create mode 100644 pkgs/development/python-modules/odp-amsterdam/default.nix diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix deleted file mode 100644 index 2b25decd4fc82..0000000000000 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pythonOlder -}: - -buildPythonPackage rec { - pname = "garages-amsterdam"; - version = "4.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "garages_amsterdam"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-ZWp543msRAgn/fFplEt6saSNbZ2flC5gwjxrll4w0W0="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - ]; - - # The only test requires network access - doCheck = false; - - pythonImportsCheck = [ - "garages_amsterdam" - ]; - - meta = with lib; { - description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix new file mode 100644 index 0000000000000..30c98144906b3 --- /dev/null +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "odp-amsterdam"; + version = "5.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-odp-amsterdam"; + rev = "refs/tags/v${version}"; + hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + + sed -i '/addopts/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "odp_amsterdam" + ]; + + meta = with lib; { + description = "Python client for getting garage occupancy in Amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 75f5cf537a20f..4d842aa556c77 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 + garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6aaa8a203bd9..c07ff886535eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3622,8 +3622,6 @@ self: super: with self; { gast = callPackage ../development/python-modules/gast { }; - garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; - gatt = callPackage ../development/python-modules/gatt { }; gattlib = callPackage ../development/python-modules/gattlib { @@ -6452,6 +6450,8 @@ self: super: with self; { odfpy = callPackage ../development/python-modules/odfpy { }; + odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { }; + offtrac = callPackage ../development/python-modules/offtrac { }; ofxclient = callPackage ../development/python-modules/ofxclient { }; -- cgit 1.4.1 From eab16a708092851b6edcb0b630f16a34ce30950e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:13:31 +0100 Subject: home-assistant: 2022.12.9 -> 2023.1.0 https://www.home-assistant.io/blog/2023/01/04/release-20231/ --- pkgs/servers/home-assistant/component-packages.nix | 38 +++++++++++++++------- pkgs/servers/home-assistant/default.nix | 17 +++------- pkgs/servers/home-assistant/frontend.nix | 4 +-- pkgs/servers/home-assistant/parse-requirements.py | 2 +- pkgs/servers/home-assistant/tests.nix | 1 + 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 26f643fcaf30a..dee4a13077ace 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.12.9"; + version = "2023.1.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -79,6 +79,9 @@ "airvisual" = ps: with ps; [ pyairvisual ]; + "airvisual_pro" = ps: with ps; [ + pyairvisual + ]; "airzone" = ps: with ps; [ aioairzone ]; @@ -657,9 +660,6 @@ ]; "derivative" = ps: with ps; [ ]; - "deutsche_bahn" = ps: with ps; [ - schiene - ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ @@ -728,6 +728,7 @@ aiohttp-cors async-upnp-client fnvhash + getmac ifaddr sqlalchemy zeroconf @@ -1147,7 +1148,7 @@ "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ - garages-amsterdam + odp-amsterdam ]; "gaviota" = ps: with ps; [ ]; @@ -1229,6 +1230,11 @@ pyturbojpeg aiohttp-cors ]; + "google_assistant_sdk" = ps: with ps; [ + aiohttp-cors + fnvhash + sqlalchemy + ]; # missing inputs: gassist-text "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -1459,12 +1465,12 @@ zigpy ]; "homekit" = ps: with ps; [ + hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash - hap-python ha-ffmpeg ifaddr sqlalchemy @@ -1586,14 +1592,14 @@ "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk - "image" = ps: with ps; [ - aiohttp-cors - pillow - ]; "image_processing" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "image_upload" = ps: with ps; [ + aiohttp-cors + pillow + ]; "imap" = ps: with ps; [ aioimaplib ]; @@ -2667,6 +2673,8 @@ "pure_energie" = ps: with ps; [ gridnet ]; + "purpleair" = ps: with ps; [ + ]; # missing inputs: aiopurpleair "push" = ps: with ps; [ aiohttp-cors ]; @@ -2801,6 +2809,9 @@ "renault" = ps: with ps; [ renault-api ]; + "reolink" = ps: with ps; [ + reolink-aio + ]; "repairs" = ps: with ps; [ aiohttp-cors ]; @@ -3619,7 +3630,7 @@ pytrafikverket ]; "transmission" = ps: with ps; [ - transmissionrpc + transmission-rpc ]; "transport_nsw" = ps: with ps; [ pytransportnsw @@ -4102,6 +4113,7 @@ "airthings_ble" "airtouch4" "airvisual" + "airvisual_pro" "airzone" "aladdin_connect" "alarm_control_panel" @@ -4354,8 +4366,8 @@ "icloud" "ifttt" "ign_sismologia" - "image" "image_processing" + "image_upload" "imap_email_content" "influxdb" "inkbird" @@ -4552,6 +4564,7 @@ "radarr" "radio_browser" "radiotherm" + "rainbird" "rainforest_eagle" "rainmachine" "random" @@ -4562,6 +4575,7 @@ "reddit" "remote" "renault" + "reolink" "repairs" "rest" "rest_command" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9b7f66f4a0200..bc7fc267dafa2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -85,17 +85,6 @@ let }; }); - hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec { - pname = "ha-hap-python"; - version = "4.5.2"; - src = fetchFromGitHub { - owner = "bdraco"; - repo = "ha-HAP-python"; - rev = "refs/tags/v4.5.2"; - hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -206,7 +195,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.12.9"; + hassVersion = "2023.1.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -224,7 +213,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tf2H4+79CGTmbKZtJpzYOzAgi90RpSy89hoDNS24m0Q="; + hash = "sha256-uYQnymJQ893F5fX/yi8S3OZL4LkT5z7QNOzkoedXllM="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -301,11 +290,13 @@ in python.pkgs.buildPythonApplication rec { checkInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) freezegun + pytest-asyncio pytest-aiohttp pytest-freezegun pytest-mock pytest-rerunfailures pytest-socket + pytest-unordered pytest-xdist pytestCheckHook requests-mock diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e91913798a18a..2f694ac96855b 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 = "20221213.1"; + version = "20230104.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-QL+3dIZlUJstRgK80ANnK9CKR4muvfEQz16bTTMS3Fs="; + hash = "sha256-tzn+TGhEcbXRly1iTLQr1UkG7y2NwLZTobDqmDe1JHo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index a77b48c6b17eb..162bb4af04b9f 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -39,7 +39,7 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "ha-av": "av", - "ha-HAP-python": "hap-python", + "HAP-python": "hap-python", "tensorflow": "tensorflow", "youtube_dl": "youtube-dl-light", } diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index cbcd0847b790f..601d0fe0367ff 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -14,6 +14,7 @@ let 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 ]; -- cgit 1.4.1 From afb7fbe6975d7994c56f1b29f4a535c239cb8583 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 02:44:47 +0100 Subject: expliot: Relax zeroconf constraint --- pkgs/tools/security/expliot/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index 4c0318ffa3bee..4ec31802710d5 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -55,7 +55,8 @@ buildPythonApplication rec { --replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" \ --replace "cryptography>=3.0,<4" "cryptography>=35,<40" \ --replace "python-can>=3.3.3,<4" "python-can>=3.3.3,<5" \ - --replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" + --replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" \ + --replace "zeroconf>=0.30,<0.40" "zeroconf" ''; # Project has no tests -- cgit 1.4.1 From 5c63f3299551a41c6643834d192a6213a61f7e1b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Jan 2023 03:16:08 +0100 Subject: python3Packages.pytest-unordered: 0.4.1 -> 0.5.2 Set format explicitly, add pytest as build input. --- .../python-modules/pytest-unordered/default.nix | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-unordered/default.nix b/pkgs/development/python-modules/pytest-unordered/default.nix index 5dc0916991c9d..5bf17834e0681 100644 --- a/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/pkgs/development/python-modules/pytest-unordered/default.nix @@ -1,25 +1,36 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-unordered"; - version = "0.4.1"; + version = "0.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "utapyngo"; - repo = pname; - rev = "972012a984b1e9fb3e98f9e8fe9e2ada16ad8110"; - hash = "sha256-mCcR6WZb2+V5n0PwgsjvnChWnANkIyQ0YtqwTKBYtaA="; + repo = "pytest-unordered"; + rev = "refs/tags/v${version}"; + hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo="; }; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + pytest + ]; - pythonImportsCheck = [ "pytest_unordered" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_unordered" + ]; meta = with lib; { + changelog = "https://github.com/utapyngo/pytest-unordered/blob/v${version}/CHANGELOG.md"; description = "Test equality of unordered collections in pytest"; homepage = "https://github.com/utapyngo/pytest-unordered"; license = licenses.mit; -- cgit 1.4.1