From f7251b58fdfcc21423f60505a2e21c35a83e1309 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Oct 2023 10:25:00 +0200 Subject: [PATCH 1/7] python311Packages.aioairzone: 0.6.8 -> 0.6.9 Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.6.8...0.6.9 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.9 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index ac094571d087..39c12ac6e2c0 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; + hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; }; nativeBuildInputs = [ From cdabf26e66ce4ef2ef65cc63abb9eab79813cf1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Oct 2023 11:46:59 +0200 Subject: [PATCH 2/7] python311Packages.aioesphomeapi: 17.2.0 -> 18.0.7 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.0 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.1 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.2 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.3 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.4 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.5 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.6 https://github.com/esphome/aioesphomeapi/releases/tag/v18.0.7 https://github.com/esphome/aioesphomeapi/compare/refs/tags/v17.2.0...v18.0.7 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 79ef028fd36e..c77a4dfadda5 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "17.2.0"; + version = "18.0.7"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+yPHIXJ0vHaFO2X3xN+7WIQUlCvoYlGi1N7W+H/ng/0="; + hash = "sha256-Jgu9NEFY74Z0mZ2Cz4uaHG0gfywa2nF/H8G1j9YAyrw="; }; propagatedBuildInputs = [ From 5a758d9d2c801bf0466d57f8d27346934b67fed6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 14:41:49 +0200 Subject: [PATCH 3/7] python311Packages.dbus-fast: 2.11.1 -> 2.12.0 https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v2.12.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index b5d2ce8eef71..4394271f7ebd 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.11.1"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oYBk+Rko5qK1k2TJdDNiN0rWdx7sdy6UpxMlDynKZ9Y="; + hash = "sha256-ZeDQn+/b6WBCodZ7Ow5IlC9XlWieAifCMJtM1yse5P8="; }; # The project can build both an optimized cython version and an unoptimized From cd22a1098c48833ac5defb6371bdddf496f31f2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 14:43:45 +0200 Subject: [PATCH 4/7] python311Packages.velbus-aio: 2023.10.0 -> 2023.10.1 https://github.com/Cereal2nd/velbus-aio/releases/tag/2023.10.1 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index dda198ff95cc..03c44ef031c0 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.10.0"; + version = "2023.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - hash = "sha256-xVELkmucrw1QazSR2XN6ldmzdTya/rWsQd1mRsLTcbU="; + hash = "sha256-v2B+tDqvQTm+K+cvTRM8LnfaFp5CTsI8/B5clBDNE08="; fetchSubmodules = true; }; From 4dcc0ce788a2bfe420e286ff44a761f93945b031 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 14:42:44 +0200 Subject: [PATCH 5/7] home-assistant: 2023.10.3 -> 2023.10.4 https://github.com/home-assistant/core/releases/tag/2023.10.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 79195bd7152e..7f9efafdfe9a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.10.3"; + version = "2023.10.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9bc35bd882c9..593099d264af 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -296,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.3"; + hassVersion = "2023.10.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-7Eg6Ik8eiPPUTXyRedQLixaCnHDg9Dmikmhcq55+458="; + hash = "sha256-HG8Uyk52Bj9CpQ+dn+dbsXVBKakXDlRktG4KSkVVVmE="; }; # Secondary source is git for tests @@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-4J1BBC6PvfbN4fKD+zUpW19sMvoKALilitNJlwB0ZTk="; + hash = "sha256-m3MjJHFq9S0dogFijIlpryqGQoHpLqkqgkWLuIxLHa8="; }; nativeBuildInputs = with python.pkgs; [ From 862bdb6435579ffd9897beda46e1b9754bbb7956 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 14:58:36 +0200 Subject: [PATCH 6/7] python311Packages.homeassistant-stubs: 2023.10.1 -> 2023.10.4 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.10.4 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index adc7089741e9..a0146829bf2c 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.10.1"; + version = "2023.10.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-4TPjYBTyrJtnYVZ+F/Bxf6m0lZn6fQR3ai0+CDTqwVc="; + hash = "sha256-iehGVXom5Wjw7A0PC4wfzed+w1h1/g9SKIuCuVRtIAs="; }; nativeBuildInputs = [ From 21317d93e1f739222c4781dcd5ff520337f72bef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Oct 2023 14:50:43 +0200 Subject: [PATCH 7/7] python311Packages.bleak: fix bluetoothctl substitution --- pkgs/development/python-modules/bleak/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 61a069305d13..f53f614867ec 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -25,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk="; }; + postPatch = '' + # bleak checks BlueZ's version with a call to `bluetoothctl --version` + substituteInPlace bleak/backends/bluezdbus/version.py \ + --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -40,12 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # bleak checks BlueZ's version with a call to `bluetoothctl --version` - substituteInPlace bleak/backends/bluezdbus/__init__.py \ - --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" - ''; - pythonImportsCheck = [ "bleak" ];