From 2d4340c2b7ff626878f19657b605921af5162768 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Nov 2022 23:35:51 +0100 Subject: [PATCH 01/37] python3Packages.bsblan: remove in favor of python-bsblan Duplicate with the correct name introduced in #197857. --- .../python-modules/bsblan/default.nix | 69 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/development/python-modules/bsblan/default.nix diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix deleted file mode 100644 index 9f35da172596..000000000000 --- a/pkgs/development/python-modules/bsblan/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, aiohttp -, aresponses -, buildPythonPackage -, fetchFromGitHub -, mypy -, packaging -, poetry-core -, pydantic -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, yarl -}: - -buildPythonPackage rec { - pname = "bsblan"; - version = "0.5.6"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "refs/tags/v${version}"; - hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c="; - }; - - nativeBuildInputs = [ - poetry-core - setuptools - ]; - - propagatedBuildInputs = [ - aiohttp - packaging - pydantic - yarl - ]; - - checkInputs = [ - aresponses - mypy - pytest-asyncio - pytest-mock - pytestCheckHook - ]; - - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - - pythonImportsCheck = [ - "bsblan" - ]; - - meta = with lib; { - description = "Python client for BSB-Lan"; - homepage = "https://github.com/liudger/python-bsblan"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 77088aa1bef2..8a33d02ba1a3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + bsblan = python-bsblan; # added 2022-11-04 bt_proximity = bt-proximity; # added 2021-07-02 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f75d7ed61b2..f7a6becb23a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1394,8 +1394,6 @@ self: super: with self; { bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - bsblan = callPackage ../development/python-modules/bsblan { }; - bson = callPackage ../development/python-modules/bson { }; bsuite = callPackage ../development/python-modules/bsuite { }; From 482ea02ea0c356254f121c48f9349c4c59e3fc96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 23:55:48 +0200 Subject: [PATCH 02/37] python310Packages.aiohomekit: 2.0.2 -> 2.2.14 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/aiohomekit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 4d0edf652085..794879d4b472 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -3,6 +3,7 @@ , aiocoap , bleak , bleak-retry-connector +, chacha20poly1305 , chacha20poly1305-reuseable , commentjson , cryptography @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.0.2"; + version = "2.2.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0="; + hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { aiocoap bleak bleak-retry-connector + chacha20poly1305 chacha20poly1305-reuseable commentjson cryptography From 8d7cec09c3166ac5be69baa398123794a3846f7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:03:55 +0200 Subject: [PATCH 03/37] python310Packages.bleak: 0.18.1 -> 0.19.1 --- pkgs/development/python-modules/bleak/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 81dd818e227b..ed21f046eae4 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -5,6 +5,7 @@ , dbus-fast , fetchFromGitHub , poetry-core +, pytest-asyncio , pytestCheckHook , pythonOlder , typing-extensions @@ -12,16 +13,16 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.18.1"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2/jJ2C2TudwCAshDBLUQjNMbYa2j4XfW8bXmeWrAyrA="; + hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; From 677f3cdeabcb79a4c3887f5daa9cf8f0afed4cc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:05:26 +0200 Subject: [PATCH 04/37] python310Packages.bleak-retry-connector: 2.1.3 -> 2.8.2 --- .../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 2e167add9b9f..26fe4d62feb4 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.1.3"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fEdyo6QBmHWgl5o/ZIu/HM8GWp5t88awhb+7SPWngf0="; + hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY="; }; postPatch = '' From 85bd60c7cb1226ea0b07cc0fd408421095b187d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Oct 2022 09:42:03 +0200 Subject: [PATCH 05/37] python310Packages.bthome-ble: 1.2.2 -> 2.1.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 5f82f2a1852f..9f0014c16feb 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 = "1.2.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2/2ODlHqQOl4LHUb2fyQpmsBYnoz0Rvc9lLEfZTKijA="; + hash = "sha256-4vk9uaG/9n3lNEWAergW9kFN2/Ta/KSax0rK9tVxAfw="; }; nativeBuildInputs = [ From 3c783987b8b8b578b0fcf76fc9598ca9f0ebca17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Oct 2022 19:07:48 +0200 Subject: [PATCH 06/37] python310Packages.bluetooth-data-tools: 0.1.2 -> 0.2.0 --- .../python-modules/bluetooth-data-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 8744adc57555..7a17d84a666c 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA="; + hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o="; }; nativeBuildInputs = [ From cec0949d405e143e0dfb5a38076d81420c2e0371 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:09:29 +0200 Subject: [PATCH 07/37] python310Packages.dbus-fast: 1.29.1 -> 1.64.0 --- .../development/python-modules/dbus-fast/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 72cb7b7ee9c7..3fabcd6a1135 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.29.1"; + version = "1.64.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GqL6PZlqFi5Es8VYeqeTsXX6j5fol2JzcosFtVCQn60="; + hash = "sha256-y/H4TYCicn6Gvv+F4ogqhNWK2mZxEVNGCY4pJAfjq9s="; }; nativeBuildInputs = [ @@ -78,6 +78,14 @@ buildPythonPackage rec { "test_standard_interfaces" "test_tcp_connection_with_forwarding" "test_unexpected_disconnect" + # NameError: name '_cast_uint32_native' is not defined + "test_unmarshall_bluez_interfaces_added_message" + "test_unmarshall_bluez_interfaces_removed_message" + "test_unmarshall_bluez_message" + "test_unmarshall_bluez_properties_changed_with_service_data" + "test_unmarshall_can_resume" + "test_unmarshalling_with_table" + "test_ay_buffer" ]; meta = with lib; { From e1cbc3f8a2e00d43ae8823238e78d89adb8f7ad7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:04:29 +0200 Subject: [PATCH 08/37] python310Packages.fjaraskupan: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/fjaraskupan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index 3c4478a8007b..bad4d7f14ef0 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fjaraskupan"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "elupus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY="; + hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps="; }; propagatedBuildInputs = [ From be8ee7e2275b6e991a2f74a45cb325b66604bfd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 21:58:46 +0200 Subject: [PATCH 09/37] python310Packages.home-assistant-bluetooth: 1.5.1 -> 1.6.0 --- .../python-modules/home-assistant-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 631e0b6eaad3..4b0a9b660cfb 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY="; + hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; }; postPatch = '' From c2687f97958d07e9dfb655b33d180e74c5bc34f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:06:32 +0200 Subject: [PATCH 10/37] python310Packages.led-ble: 0.10.1 -> 1.0.0 --- pkgs/development/python-modules/led-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 92f397a4c517..810a9d59c02c 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "0.10.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GyVj9g4tqPaR5Gd8N76TtkldaAATnEBsSs/F+2iQqGM="; + hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; }; postPatch = '' From 0917dd484eb2d93ecdb10da60cdebaf1e9579120 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 10:59:16 +0200 Subject: [PATCH 11/37] python310Packages.oralb-ble: init at 0.10.1 --- .../python-modules/oralb-ble/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/oralb-ble/default.nix diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix new file mode 100644 index 000000000000..8905529f6dec --- /dev/null +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "oralb-ble"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Iuu44H8fCbJysoSJLBtlJ1XE5Ad2caWihj3UZytWK3o="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "oralb_ble" + ]; + + meta = with lib; { + description = "Library for Oral B BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7a6becb23a1..9ea30fb92d97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6486,6 +6486,8 @@ self: super: with self; { opuslib = callPackage ../development/python-modules/opuslib { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; From 3c7db59478e0ec575e4bd1c4ecaeab1ad7be2a1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:07:25 +0200 Subject: [PATCH 12/37] python310Packages.pyswitchbot: 0.19.15 -> 0.20.2 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ec7758f664b8..6ba4edcde88c 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.19.15"; + version = "0.20.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg="; + hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c="; }; propagatedBuildInputs = [ From d4cc3aba2edb2479afe81db8f2402ee13c1a6a1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Nov 2022 23:34:55 +0100 Subject: [PATCH 13/37] python310Packages.sensor-state-data: 2.9.1 -> 2.10.1 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index ea26d5b86f21..20bd058fdf5a 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.9.1"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bBLBDdwVUCh8VA/6w/5DmJNvayaWHNIe1kRhnOQ2Llc="; + hash = "sha256-pCo9CMX+CQBFuK5rbMHsxQEdBHvp1EZA7A9Ykm68NCw="; }; nativeBuildInputs = [ From 619ffc8cb0ae1c46d324c914f23ae7d46312efd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:08:38 +0200 Subject: [PATCH 14/37] python310Packages.yalexs-ble: 1.9.2 -> 1.9.5 --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 67bbdc965b51..084feb2e6ca4 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.9.2"; + version = "1.9.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-ypZ0VDGgQcwlMS1POW+lvTlmd02P7bPR2Qo0lDyBYUw="; + hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo="; }; nativeBuildInputs = [ From 4153fd3444089f9837f9345956080c595b49c3ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 10:37:37 +0200 Subject: [PATCH 15/37] python310Packages.aiopyarr: 22.9.0 -> 22.10.0 --- pkgs/development/python-modules/aiopyarr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index e9dec57f4d18..eba27f0390ad 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -2,7 +2,9 @@ , aiohttp , aresponses , buildPythonPackage +, ciso8601 , fetchFromGitHub +, orjson , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.9.0"; + version = "22.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,11 +21,13 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-nJjqpk4GcgXJhFZd4E3vSmyNP+RkOASEd4Ipemx6cAc="; + hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88="; }; propagatedBuildInputs = [ aiohttp + ciso8601 + orjson ]; checkInputs = [ From a3109223f306dd7c9b876913209bbba8b5ee25ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 10:31:02 +0000 Subject: [PATCH 16/37] python310Packages.aioshelly: 3.0.0 -> 4.1.2 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a3dfa62705a5..c4881dcdd56f 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "3.0.0"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; + hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; }; propagatedBuildInputs = [ From 80f87533206b54d4b8c7c864cd0b9927ba0982ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 18:55:40 +0000 Subject: [PATCH 17/37] python310Packages.aiounifi: 40 -> 41 --- 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 38b84ddf5729..b75b9ac31810 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 = "40"; + version = "41"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A="; + hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; }; propagatedBuildInputs = [ From 71663ee8565be81be5345ba21701da66eb12a7d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 18:02:17 +0000 Subject: [PATCH 18/37] python310Packages.freebox-api: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/freebox-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a04dada07dcc..76fd69bd0223 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "freebox-api"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So="; + rev = "refs/tags/v${version}"; + hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY="; }; nativeBuildInputs = [ From b342a3d291eea516ccb8b5dec8034011f50ddfec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Nov 2022 01:24:57 +0100 Subject: [PATCH 19/37] python310Packages.gcal-sync: 2.1.0 -> 3.0.0 --- .../python-modules/gcal-sync/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 85b536b836db..e9afe6ef1b49 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -1,18 +1,20 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp -, pydantic +, buildPythonPackage +, fetchFromGitHub , freezegun +, ical +, pydantic , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gcal-sync"; - version = "2.1.0"; + version = "3.0.0"; + format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,11 +22,12 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-FKrZPiN4rSk5iFhGAXVuKhEeekOnPxdFslP4SMUrQIE="; + hash = "sha256-xRmNV06gMdPPHcvgJTvxPZBUi1BbFTnwZpzXLBluBYo="; }; propagatedBuildInputs = [ aiohttp + ical pydantic ]; @@ -35,12 +38,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "gcal_sync" ]; + pythonImportsCheck = [ + "gcal_sync" + ]; - meta = { - description = "Python library for syncing Google Calendar to local storage"; + meta = with lib; { + description = "Library for syncing Google Calendar to local storage"; homepage = "https://github.com/allenporter/gcal_sync"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } From 31dcf3282fc2ef463001e567f7744f1bf55e042d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 23:23:28 +0100 Subject: [PATCH 20/37] python310Packages.pyatmo: 7.2.0 -> 7.3.0 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5a570464abf2..afa5f0c378b1 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.2.0"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5RlYTgxWm6BM/V2+1IF/rje5dNirN7PJs0eSiYeOpOQ="; + sha256 = "sha256-3NgAsXMdt4FsE30oxeTfunpP2e+iqLFZkhMJbc5jVGw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 852d12c567be8583d9e276b84d604637b3ff6569 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Oct 2022 19:27:25 +0200 Subject: [PATCH 21/37] python310Packages.pydaikin: 2.7.2 -> 2.8.0 --- pkgs/development/python-modules/pydaikin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 66608d7783cc..ba6612bbde47 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig="; + hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; }; propagatedBuildInputs = [ From 5e9e8a21d99550c8f2533fbe150b497d1f3aae16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Oct 2022 16:15:29 +0000 Subject: [PATCH 22/37] python310Packages.pydeconz: 104 -> 105 --- 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 185e83450937..c81c42d47707 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 = "104"; + version = "105"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic="; + hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE="; }; propagatedBuildInputs = [ From 8fd76214e51916f96ab74cc15c9cbf083f7f32a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 11:19:23 +0100 Subject: [PATCH 23/37] python3Packages.pylutron-caseta: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 89b7dd6c7f39..114e295c66ea 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - hash = "sha256-8keKhwbvqIMxbfmd9GGF7uacOyvqb8G/ifq+pr4Z700="; + hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao="; }; nativeBuildInputs = [ From b563b609e0f4206d95696cae2774d15d4cf247c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:42:44 +0100 Subject: [PATCH 24/37] python310Packages.pysma: 0.6.12 -> 0.7.2 (#196816) --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 5ec0aa44995e..96864141e054 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.12"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I="; + sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8="; }; propagatedBuildInputs = [ From 6406b938358c2b38a284d7a4bac34ad1600e0a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:44:25 +0100 Subject: [PATCH 25/37] python310Packages.subarulink: 0.5.0 -> 0.6.1 (#193462) --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index f25322531789..d788e164f80d 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.5.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; + hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; }; propagatedBuildInputs = [ From 0e7b91dd13908cedb47187a284e3b5770f22d9cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 00:56:24 +0100 Subject: [PATCH 26/37] python3Packages.xknx: 1.1.0 -> 1.2.0 https://github.com/XKNX/xknx/releases/tag/1.2.0 --- pkgs/development/python-modules/xknx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 315bcf87b17f..e82602d3458c 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 = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0="; + hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ="; }; propagatedBuildInputs = [ @@ -41,6 +41,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access "test_scan_timeout" + "test_start_secure_routing_knx_keys" + "test_start_secure_routing_manual" ]; meta = with lib; { From 3d3e6b8ac13c5a50ae3854f96a6a9320b67fc3c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:04:50 +0000 Subject: [PATCH 27/37] python310Packages.zha-quirks: 0.0.83 -> 0.0.84 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b48804ed8670..94bf7cf397ab 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.83"; + version = "0.0.84"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA="; + hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE="; }; propagatedBuildInputs = [ From c38beec6b2849ffb4e285c0fdf38d197bab15d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:05:28 +0000 Subject: [PATCH 28/37] python310Packages.zigpy: 0.51.3 -> 0.51.5 --- 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 fbce8f8db61e..c7abaac023aa 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.3"; + version = "0.51.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw="; + hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; }; propagatedBuildInputs = [ From 7be740d950202af2ad2a60074d8c35cd8205a1fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:07:31 +0000 Subject: [PATCH 29/37] python310Packages.zigpy-zigate: 0.10.2 -> 0.10.3 --- 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 694871fbf78a..24cf7f30eb30 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.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/v${version}"; - hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk="; + hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY="; }; propagatedBuildInputs = [ From 35619a928d4e415541e75ef7f69377a7f0b95c90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:10:39 +0100 Subject: [PATCH 30/37] home-assistant: fix requirements parser version detection --- .../home-assistant/parse-requirements.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b2d8e49efc58..a77b48c6b17e 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -168,8 +168,8 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional return None -def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - pkg = packages.get(f"{PKG_SET}.{package}", None) +def get_pkg_version(attr_path: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: + pkg = packages.get(attr_path, None) if not pkg: return None return pkg["version"] @@ -198,12 +198,14 @@ def main() -> None: extras = name[name.find("[")+1:name.find("]")].split(",") name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) - if our_version := get_pkg_version(name, packages): - if Version.parse(our_version) < Version.parse(required_version): - outdated[name] = { - 'wanted': required_version, - 'current': our_version - } + if attr_path: + if our_version := get_pkg_version(attr_path, packages): + attr_name = attr_path.split(".")[-1] + if Version.parse(our_version) < Version.parse(required_version): + outdated[attr_name] = { + 'wanted': required_version, + 'current': our_version + } if attr_path is not None: # Add attribute path without "python3Packages." prefix pname = attr_path[len(PKG_SET + "."):] From de0d6bd58d4fd29559f41cc4b035795ce6cce93b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:11:54 +0100 Subject: [PATCH 31/37] python3Packages.pyrmvtransport: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pyrmvtransport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index e76152e218d4..1db84979e2a1 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyrmvtransport"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb"; + sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; }; nativeBuildInputs = [ From 171e8e0c8994ee2ba6ea919d847333b8cc1779d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:15:14 +0100 Subject: [PATCH 32/37] python3Packages.av: 9.2.0 -> 10.0.0 --- pkgs/development/python-modules/av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 088965d7dfd2..3457d2d37b23 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "av"; - version = "9.2.0"; + version = "10.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mikeboers"; repo = "PyAV"; rev = "v${version}"; - hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0="; + hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak="; }; nativeBuildInputs = [ From a975823d5b148f58547bdbb4b0a444a609ae6712 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:29:48 +0100 Subject: [PATCH 33/37] python3Packages.mac-vendor-lookup: init at 0.1.12 --- .../mac-vendor-lookup/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mac-vendor-lookup/default.nix diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix new file mode 100644 index 000000000000..2c0a7d4f7240 --- /dev/null +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +}: + +buildPythonPackage rec { + pname = "mac-vendor-lookup"; + version = "0.1.12"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bauerj"; + repo = "mac_vendor_lookup"; + rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; + hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + }; + + postPatch = '' + sed -i '/mac-vendors.txt/d' setup.py + ''; + + propagatedBuildInputs = [ + aiofiles + aiohttp + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "mac_vendor_lookup" + ]; + + meta = with lib; { + description = "Find the vendor for a given MAC address"; + homepage = "https://github.com/bauerj/mac_vendor_lookup"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ea30fb92d97..2ca70dc4dd6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5431,6 +5431,8 @@ self: super: with self; { mac_alias = callPackage ../development/python-modules/mac_alias { }; + mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; From 35b0503fecb7b3daac0eecf6e940126c865d70b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:30:48 +0100 Subject: [PATCH 34/37] python3Packages.ibeacon-ble: 0.7.4 -> 1.0.1 --- .../python-modules/ibeacon-ble/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 18476fac8c4b..ba4c156f3a56 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -1,7 +1,9 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , home-assistant-bluetooth +, mac-vendor-lookup , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +11,7 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "0.7.4"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,26 +20,28 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-B+ftS/oNCECjCqB396K5iCl0aeJSBGVXshlvZ1kvEuo="; + hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + aiohttp home-assistant-bluetooth + mac-vendor-lookup ]; checkInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "ibeacon_ble" ]; From 69cf4149ab2fb9ed26f6f81d354a2e2c7b3d45b7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 5 Nov 2022 12:10:32 +0000 Subject: [PATCH 35/37] python3Packages.aiolifx-themes: init at v0.2.0 --- .../python-modules/aiolifx-themes/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/aiolifx-themes/default.nix diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix new file mode 100644 index 000000000000..4aeec041c043 --- /dev/null +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, aiolifx +, poetry-core +, pytest-asyncio +, pytestCheckHook +, async-timeout +, typer +}: + +buildPythonPackage rec { + pname = "aiolifx-themes"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Djelibeybi"; + repo = "aiolifx-themes"; + rev = "v${version}"; + hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz"; + }; + + prePatch = '' + # Don't run coverage, or depend on typer for no reason. + substituteInPlace pyproject.toml \ + --replace " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \ + --replace "typer = " "# unused: typer = " + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiolifx + ]; + + checkInputs = [ + async-timeout + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "aiolifx_themes" + ]; + + meta = with lib; { + description = "Color themes for LIFX lights running on aiolifx"; + homepage = "https://github.com/Djelibeybi/aiolifx-themes"; + license = licenses.mit; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ca70dc4dd6f..ae46e21fd2e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -238,6 +238,8 @@ self: super: with self; { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { }; + aiolimiter = callPackage ../development/python-modules/aiolimiter { }; aiolip = callPackage ../development/python-modules/aiolip { }; From 521dc77a2a9a8c640e98c66692f1dd5a478670ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 02:01:42 +0100 Subject: [PATCH 36/37] home-assistant: 2022.10.5 -> 2022.11.1 https://www.home-assistant.io/blog/2022/11/02/release-202211/ https://github.com/home-assistant/core/releases/tag/2022.11.1 --- .../home-assistant/component-packages.nix | 152 +++++++++++++++++- pkgs/servers/home-assistant/default.nix | 48 ++---- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 10 +- 4 files changed, 173 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f2f472276c87..796546fd0b9f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,8 +2,10 @@ # Do not edit! { - version = "2022.10.5"; + version = "2022.11.1"; components = { + "3_day_blinds" = ps: with ps; [ + ]; "abode" = ps: with ps; [ abodepy ]; @@ -51,6 +53,21 @@ "airthings" = ps: with ps; [ airthings-cloud ]; + "airthings_ble" = ps: with ps; [ + aiohttp-cors + airthings-ble + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pyudev + sqlalchemy + ]; "airtouch4" = ps: with ps; [ airtouch4pyapi ]; @@ -98,6 +115,8 @@ amcrest ha-ffmpeg ]; + "amp_motorization" = ps: with ps; [ + ]; "ampio" = ps: with ps; [ asmog ]; @@ -203,6 +222,8 @@ yalexs-ble yalexs ]; + "august_ble" = ps: with ps; [ + ]; "aurora" = ps: with ps; [ auroranoaa ]; @@ -281,6 +302,10 @@ "blinksticklight" = ps: with ps; [ BlinkStick ]; + "bliss_automation" = ps: with ps; [ + ]; + "bloc_blinds" = ps: with ps; [ + ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ @@ -352,6 +377,8 @@ "braviatv" = ps: with ps; [ pybravia ]; + "brel_home" = ps: with ps; [ + ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -367,7 +394,9 @@ brunt ]; "bsblan" = ps: with ps; [ - bsblan + python-bsblan + ]; + "bswitch" = ps: with ps; [ ]; "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist @@ -388,6 +417,10 @@ pyudev sqlalchemy ]; + "bticino" = ps: with ps; [ + ]; + "bubendorff" = ps: with ps; [ + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -499,6 +532,8 @@ ]; "cover" = ps: with ps; [ ]; + "cozytouch" = ps: with ps; [ + ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy "cpuspeed" = ps: with ps; [ @@ -517,6 +552,8 @@ ]; "currencylayer" = ps: with ps; [ ]; + "dacia" = ps: with ps; [ + ]; "daikin" = ps: with ps; [ pydaikin ]; @@ -616,6 +653,10 @@ "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "diaz" = ps: with ps; [ + ]; + "digital_loggers" = ps: with ps; [ + ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -668,6 +709,8 @@ aiohttp-cors doorbirdpy ]; + "dooya" = ps: with ps; [ + ]; "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ @@ -944,6 +987,8 @@ "flexit" = ps: with ps; [ pymodbus ]; + "flexom" = ps: with ps; [ + ]; "flic" = ps: with ps; [ pyflic ]; @@ -1038,12 +1083,15 @@ "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; + "gaviota" = ps: with ps; [ + ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ + aiohttp-cors av pillow ]; @@ -1210,6 +1258,8 @@ pillow sqlalchemy ]; + "havana_shade" = ps: with ps; [ + ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ @@ -1219,12 +1269,16 @@ ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 + "heiwa" = ps: with ps; [ + ]; "heos" = ps: with ps; [ pyheos ]; "here_travel_time" = ps: with ps; [ herepy ]; + "hi_kumo" = ps: with ps; [ + ]; "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ @@ -1340,12 +1394,15 @@ aiohue ]; "huisbaasje" = ps: with ps; [ - ]; # missing inputs: energyflip-client + energyflip-client + ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ aiopvapi ]; + "hurrican_shutters_wholesale" = ps: with ps; [ + ]; "hvv_departures" = ps: with ps; [ pygti ]; @@ -1442,6 +1499,8 @@ ]; "input_text" = ps: with ps; [ ]; + "inspired_shades" = ps: with ps; [ + ]; "insteon" = ps: with ps; [ aiohttp-cors fnvhash @@ -1491,6 +1550,8 @@ "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; + "ismartwindow" = ps: with ps; [ + ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss "isy994" = ps: with ps; [ @@ -1640,6 +1701,8 @@ pyudev sqlalchemy ]; + "legrand" = ps: with ps; [ + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1656,6 +1719,7 @@ aiohttp-cors aiolifx aiolifx-effects + aiolifx-themes ifaddr ]; "lifx_cloud" = ps: with ps; [ @@ -1736,6 +1800,8 @@ "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; + "luxaflex" = ps: with ps; [ + ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ @@ -1764,6 +1830,10 @@ pillow sqlalchemy ]; + "marantz" = ps: with ps; [ + ]; + "martec" = ps: with ps; [ + ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ @@ -2043,6 +2113,8 @@ "nexia" = ps: with ps; [ nexia ]; + "nexity" = ps: with ps; [ + ]; "nextbus" = ps: with ps; [ py-nextbusnext ]; @@ -2076,8 +2148,9 @@ aiohttp-cors getmac ifaddr + mac-vendor-lookup netmap - ]; # missing inputs: mac-vendor-lookup + ]; "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ @@ -2115,6 +2188,8 @@ "nut" = ps: with ps; [ pynut2 ]; + "nutrichef" = ps: with ps; [ + ]; "nws" = ps: with ps; [ pynws ]; @@ -2216,6 +2291,21 @@ "opple" = ps: with ps; [ pyoppleio ]; + "oralb" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + oralb-ble + pillow + pyserial + pyudev + sqlalchemy + ]; "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ @@ -2265,6 +2355,8 @@ pillow sqlalchemy ]; + "pcs_lighting" = ps: with ps; [ + ]; "peco" = ps: with ps; [ peco ]; @@ -2468,6 +2560,8 @@ ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client + "raven_rock_mfg" = ps: with ps; [ + ]; "rdw" = ps: with ps; [ vehicle ]; @@ -2508,6 +2602,8 @@ ]; "rest_command" = ps: with ps; [ ]; + "rexel" = ps: with ps; [ + ]; "rflink" = ps: with ps; [ rflink ]; @@ -2535,6 +2631,8 @@ "rmvtransport" = ps: with ps; [ pyrmvtransport ]; + "roborock" = ps: with ps; [ + ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ @@ -2616,6 +2714,8 @@ lxml xmltodict ]; + "screenaway" = ps: with ps; [ + ]; "screenlogic" = ps: with ps; [ screenlogicpy ]; @@ -2647,6 +2747,8 @@ fnvhash sqlalchemy ]; + "sensorblue" = ps: with ps; [ + ]; "sensorpro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -2704,6 +2806,7 @@ "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ + aiohttp-cors aioshelly ]; "shiftr" = ps: with ps; [ @@ -2732,6 +2835,8 @@ "simplisafe" = ps: with ps; [ simplisafe-python ]; + "simply_automated" = ps: with ps; [ + ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ @@ -2770,9 +2875,15 @@ aiohttp-cors pysmappee ]; + "smart_blinds" = ps: with ps; [ + ]; + "smart_home" = ps: with ps; [ + ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; + "smarther" = ps: with ps; [ + ]; "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -2803,6 +2914,21 @@ "snmp" = ps: with ps; [ pysnmplib ]; + "snooz" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pysnooz + pyudev + sqlalchemy + ]; "solaredge" = ps: with ps; [ solaredge stringcase @@ -2818,6 +2944,8 @@ "soma" = ps: with ps; [ pysoma ]; + "somfy" = ps: with ps; [ + ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; @@ -2967,6 +3095,8 @@ ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate + "symfonisk" = ps: with ps; [ + ]; "syncthing" = ps: with ps; [ aiosyncthing ]; @@ -3073,6 +3203,8 @@ sqlalchemy thermobeacon-ble ]; + "thermoplus" = ps: with ps; [ + ]; "thermopro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -3243,6 +3375,8 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; + "ultraloq" = ps: with ps; [ + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -3277,6 +3411,8 @@ ifaddr zeroconf ]; + "uprise_smart_shades" = ps: with ps; [ + ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ @@ -3557,6 +3693,7 @@ py-zabbix ]; "zamg" = ps: with ps; [ + zamg ]; "zengge" = ps: with ps; [ bluepy @@ -3630,6 +3767,7 @@ "airly" "airnow" "airthings" + "airthings_ble" "airtouch4" "airvisual" "airzone" @@ -3695,6 +3833,7 @@ "canary" "cast" "cert_expiry" + "clicksend_tts" "climate" "cloud" "cloudflare" @@ -3871,6 +4010,7 @@ "http" "huawei_lte" "hue" + "huisbaasje" "humidifier" "hunterdouglas_powerview" "hvv_departures" @@ -4005,6 +4145,7 @@ "nextdns" "nightscout" "nina" + "nmap_tracker" "no_ip" "nobo_hub" "notify" @@ -4033,6 +4174,7 @@ "openuv" "openweathermap" "opnsense" + "oralb" "overkiz" "ovo_energy" "owntracks" @@ -4145,6 +4287,7 @@ "smtp" "snips" "snmp" + "snooz" "solaredge" "solarlog" "solax" @@ -4297,6 +4440,7 @@ "yeelight" "yolink" "youless" + "zamg" "zeroconf" "zerproc" "zha" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 69ce9addcd67..795d42cf53eb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -41,26 +41,15 @@ let }; }); - bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - postPatch = null; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ]; + gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "v.${version}"; - hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; - }; - }); - - blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.2"; - src = fetchFromGitHub { - owner = "blebox"; - repo = "blebox_uniapi"; - rev = "refs/tags/v${version}"; - hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; + owner = "allenporter"; + repo = "gcal_sync"; + rev = "refs/tags/${version}"; + hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY="; }; + doCheck = false; # requires aiohttp>=1.0.0 }); gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { @@ -84,16 +73,6 @@ let }; }); - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU="; - }; - }); - # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; @@ -115,9 +94,6 @@ let aioopenexchangerates = super.aioopenexchangerates.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 }); @@ -161,6 +137,12 @@ let }; }); + pydaikin = super.pydaikin.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_power_sensors" + ]; + }); + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -254,7 +236,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.5"; + hassVersion = "2022.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -272,7 +254,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-y2X6tiR3TLbQ1tYUUuu8D0i5j+P0FnDWJ1mSlGPwIuY="; + hash = "sha256-2zpNrkRYsmJEq+4L0J6wJodmda5r8NWgYVtYwAHKSps="; }; # 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 5282874435f3..9f9bcf022356 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 = "20221010.0"; + version = "20221102.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8="; + sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index c40d9e71989c..1651e3026644 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,10 @@ let # bytearrray mismatch "test_rfy_cover" ]; + zha = [ + # 'manual_pick_radio_type' == 'choose_serial_port' + "test_options_flow_migration_reset_old_adapter" + ]; }; extraPytestFlagsArray = { @@ -62,6 +66,10 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + modem_callerid = [ + # aioserial mock produces wrong state + "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" + ]; skybell = [ # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" @@ -106,8 +114,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - "modem_callerid" - "subaru" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; From 7bbc6e29b134f277ed40fd81948ddb367cbdb64f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:39:00 +0100 Subject: [PATCH 37/37] nixos/home-assistant: update bluetooth components --- nixos/modules/services/home-automation/home-assistant.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 26a5e3fe44b8..2962e52c08bb 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -433,6 +433,8 @@ in { componentsUsingBluetooth = [ # Components that require the AF_BLUETOOTH address family "august" + "august_ble" + "airthings_ble" "bluemaestro" "bluetooth" "bluetooth_le_tracker" @@ -445,15 +447,19 @@ in { "govee_ble" "homekit_controller" "inkbird" + "keymitt_ble" "led_ble" "melnor" "moat" + "oralb" "qingping" "sensorpro" "sensorpush" + "snooz" "switchbot" "thermobeacon" "thermopro" + "tilt_ble" "xiaomi_ble" "yalexs_ble" ];