From 2c7b03c09bd5fa9eed1c32bc9e9629ee030bec8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 21:41:42 +0200 Subject: [PATCH 01/21] python312Packages.aioautomower: 2024.3.3 -> 2024.4.0 https://github.com/Thomas55555/aioautomower/releases/tag/2024.3.4 https://github.com/Thomas55555/aioautomower/releases/tag/2024.3.5 https://github.com/Thomas55555/aioautomower/releases/tag/2024.4.0 --- pkgs/development/python-modules/aioautomower/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index f6a02d393e5f..99d8175b62ed 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, freezegun , mashumaro , poetry-core , pyjwt @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.3.3"; + version = "2024.4.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-ZJRc5nzp1P3X93PxGVB55VgN1HZ2kvn43LT2wYEPxSo="; + hash = "sha256-W6aZdvg+EZKv0pmIaPOBaJaWipq3AENTVAVon/lFuI4="; }; postPatch = '' @@ -44,6 +45,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytest-asyncio pytestCheckHook syrupy From 5401a75a1ddf254de328597eee53c262f5283f5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 21:44:44 +0200 Subject: [PATCH 02/21] python312Packages.aiodhcpwatcher: 0.8.2 -> 1.0.1 https://github.com/bdraco/aiodhcpwatcher/blob/v1.0.1/CHANGELOG.md --- pkgs/development/python-modules/aiodhcpwatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix index b96e7eb29fbc..5c8adc9b4b99 100644 --- a/pkgs/development/python-modules/aiodhcpwatcher/default.nix +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aiodhcpwatcher"; - version = "0.8.2"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiodhcpwatcher"; rev = "v${version}"; - hash = "sha256-yvmCp8luR26yFYun/YY/tt+peaAL4nOR9cC6lpMiJhk="; + hash = "sha256-0of+no92s9SEKG1tc9lFlWR8f5Jnf3C723goQViB6+A="; }; postPatch = '' From 75b9d815a7fdc3e0bd2f6e68ec73708ee576ca32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 21:53:34 +0200 Subject: [PATCH 03/21] python312Packages.axis: 58 -> 60 https://github.com/Kane610/axis/releases/tag/v60 --- pkgs/development/python-modules/axis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index 4f9e456de6aa..fd222780154b 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "axis"; - version = "58"; + version = "60"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "axis"; rev = "refs/tags/v${version}"; - hash = "sha256-6Mxthf37PtJSWsi+Ok0zBezTJLPwVoc8S1ZdQE57BEI="; + hash = "sha256-MBiifETNfWq3TYCGPETDreiMZsrUdb79QvTG5wbVMJU="; }; postPatch = '' From 2110e197e8cafe302bbdcbdb4b9c28c16a78e1c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 22:11:00 +0200 Subject: [PATCH 04/21] python312Packages.pyrisco: 0.5.10 -> 0.6.0 https://github.com/OnFreund/pyrisco/releases/tag/v0.6.0 --- pkgs/development/python-modules/pyrisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 77c1e9933261..8c9ec561324a 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.10"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-3wa6hayyjWdDVqbLPCqIZ4lgcy1/EdFH4ZVggSRizZU="; + hash = "sha256-+qnwJzf4nKio4IJo7NNA19B3tbOd+jhnGryiRMcdi6o="; }; nativeBuildInputs = [ From 2055d6e33680d5fb59852d7db6c637cc6887d196 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Mar 2024 01:24:39 +0000 Subject: [PATCH 05/21] python312Packages.python-homewizard-energy: 4.3.1 -> 5.0.0 --- .../python-modules/python-homewizard-energy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 20bd7409f6cd..8447c2bccbe9 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.3.1"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-LpxXTzUb+N15lGno3pAhRSEJCb4NmwBcGQ/PshI9gYA="; + hash = "sha256-z9JJHS7w/lugV23xJjWHBWVQp38J3CKtj4IuDvpPQJw="; }; postPatch = '' From 45fded6fdbf5ebdac0c69dcf139a89e268df5027 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 22:15:05 +0200 Subject: [PATCH 06/21] python312Packages.roombapy: 1.7.0 -> 1.8.1 https://github.com/pschmitt/roombapy/releases/tag/1.8.0 https://github.com/pschmitt/roombapy/releases/tag/1.8.1 --- .../python-modules/roombapy/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 81841aadebee..465da76efe4b 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -1,20 +1,22 @@ { lib , amqtt , buildPythonPackage +, click , fetchFromGitHub +, mashumaro , orjson , paho-mqtt , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, tabulate }: buildPythonPackage rec { pname = "roombapy"; - version = "1.7.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-vB6+cGqeHFthCbz4q75EwsHb8w1H2vPSaKdtvquh5Kc="; + hash = "sha256-1yfmaTzZ7cZW2+Yb3Zbo8+5TfD+H1sA0+SzC1c9MdsQ="; }; nativeBuildInputs = [ @@ -36,9 +38,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + mashumaro orjson paho-mqtt - pydantic + ]; + + optional-dependencies.cli = [ + click + tabulate ]; nativeCheckInputs = [ From a48689b7ed561371d537d1c33d38fbc7b92b3e34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Mar 2024 20:39:33 +0100 Subject: [PATCH 07/21] python311Packages.tololib: 0.1.0b4 -> 1.1.0 Diff: https://gitlab.com/MatthiasLohr/tololib/-/compare/refs/tags/v0.1.0b4...v1.1.0 Changelog: https://gitlab.com/MatthiasLohr/tololib/-/blob/v1.1.0/CHANGELOG.md --- .../development/python-modules/tololib/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index f0204e08f8d8..ed530f95d191 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "tololib"; - version = "0.1.0b4"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "MatthiasLohr"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2OQaJR70bx8qWs1IPErF+B3X1iRvHW74axTqtdvum3U="; + repo = "tololib"; + rev = "refs/tags/v${version}"; + hash = "sha256-TxWKV2nrnCxZmj6+wBDMSdJRvKV+MsPFbOyIlUJYJ3Q="; }; nativeBuildInputs = [ @@ -29,6 +29,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + disabledTests = [ # Test requires network access "test_discovery" From ab5596659fd5993ecb7eb4ad03051bd57b45a7e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 00:38:19 +0000 Subject: [PATCH 08/21] python312Packages.vilfo-api-client: 0.4.1 -> 0.5.0 --- .../development/python-modules/vilfo-api-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 99a10fd320d3..b4b9f77304ef 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "vilfo-api-client"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ManneW"; repo = "vilfo-api-client-python"; - rev = version; - hash = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys="; + rev = "refs/tags/${version}"; + hash = "sha256-ZlmriBd+M+54ux/UNYa355mkz808/NxSz7IzmWouA0c="; }; postPatch = '' From 962421a9e71c747a5fc75dfcd50541641cd7c107 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:34:20 +0200 Subject: [PATCH 09/21] python312Packages.zeroconf: 0.131.0 -> 0.132.0 (#300791) Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.131.0...0.132.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.132.0 --- .../python-modules/zeroconf/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index c721259efa43..a65afbbd3ffe 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -14,30 +14,30 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.131.0"; - format = "pyproject"; + version = "0.132.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-l+uz+wj+tgptxEjEN8ZlmxH8I4Nhrg8qAY3yCcOgBfE="; + hash = "sha256-eHB+SkJU5aTQPF7QqRhYHMBJgN7EYZkwtk7gjxWxIno="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "Cython>=3.0.5" "Cython" + --replace-fail "Cython>=3.0.8" "Cython" ''; - nativeBuildInputs = [ + build-system = [ cython_3 poetry-core setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout @@ -70,9 +70,9 @@ 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/python-zeroconf/python-zeroconf"; + changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; From 87c0e628e1eb109aab5098dd9260704596016680 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 18:36:50 +0200 Subject: [PATCH 10/21] python312Packages.zigpy: 0.63.4 -> 0.63.5 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.63.5 --- .../python-modules/zigpy/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 2b7060ddc223..d0c10530f0d9 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -7,6 +7,7 @@ , cryptography , freezegun , fetchFromGitHub +, jsonschema , pycryptodome , pyserial-asyncio , pytest-asyncio @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.63.4"; + version = "0.63.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,24 +29,25 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-0wenUUkhgodsBID+ZT9JRoJeGDTqAChAIpj+9/Q3FMM="; + hash = "sha256-iZxHXxheyoA5vo0Pxojs7QE8rSyTpsYpJ6/OzDSZJ20="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiosqlite crccheck cryptography + jsonschema pyserial-asyncio pycryptodome voluptuous @@ -66,6 +68,11 @@ buildPythonPackage rec { "test_periodic_scan_priority" ]; + disabledTestPaths = [ + # Tests require network access + "tests/ota/test_ota_providers.py" + ]; + pythonImportsCheck = [ "zigpy.application" "zigpy.config" From 63ce6d15a9feb975b4b3407a8bed186987aeb1ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 20:15:19 +0200 Subject: [PATCH 11/21] python312Packages.zigpy: refactor --- pkgs/development/python-modules/zigpy/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index d0c10530f0d9..0a32dea6649a 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,12 +1,15 @@ { lib , aiohttp -, aiosqlite , aioresponses +, aiosqlite +, async-timeout +, attrs , buildPythonPackage , crccheck , cryptography -, freezegun , fetchFromGitHub +, freezegun +, importlib-resources , jsonschema , pycryptodome , pyserial-asyncio @@ -15,6 +18,7 @@ , pytestCheckHook , pythonOlder , setuptools +, typing-extensions , voluptuous }: @@ -43,14 +47,20 @@ buildPythonPackage rec { ]; dependencies = [ + attrs aiohttp aiosqlite crccheck cryptography jsonschema pyserial-asyncio + typing-extensions pycryptodome voluptuous + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ From 426c70b8b3b3b2ea5fc936e3fae18156b525e5f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 20:17:43 +0200 Subject: [PATCH 12/21] python312Packages.zha-quirks: 0.0.112 -> 0.0.113 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.112...0.0.113 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.113 --- .../python-modules/zha-quirks/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f7e7c7f4f26a..7652eee0350c 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -11,29 +11,29 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.112"; + version = "0.0.113"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-wI7mpX6oFV/RrxH/UP1X9Odago0CxJ5dhjKAsDS+Sq4="; + hash = "sha256-Th0JF7sauDhFIZH7BY4STgJZ2o+zqQmtUqNLNeaB6As="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp zigpy ]; From fb15a387ca2fe9f4c440c0d8734d11f0051f1a0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 20:29:06 +0200 Subject: [PATCH 13/21] python312Packages.bellows: refactor --- pkgs/development/python-modules/bellows/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 344e14a30f0c..8c1502a8e1c5 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , click , click-log @@ -30,21 +31,23 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"setuptools-git-versioning<2"' "" \ - --replace 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ @@ -59,10 +62,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; - mainProgram = "bellows"; homepage = "https://github.com/zigpy/bellows"; changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; + mainProgram = "bellows"; }; } From 1f76b6f5c664c454a1a02e379b5e240b7dc2ee88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 Apr 2024 20:45:25 +0200 Subject: [PATCH 14/21] python312Packages.universal-silabs-flasher: refactor - Fix version (was not picked up proberly) Unpacking to: unpacked/universal_silabs_flasher-0.0.1...OK --- .../universal-silabs-flasher/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 8c73bc5205ef..bfc6bb97aab4 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -6,7 +6,6 @@ # build-system , setuptools -, setuptools-git-versioning # dependencies , async-timeout @@ -37,10 +36,18 @@ buildPythonPackage rec { hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + nativeBuildInputs = [ pythonRelaxDepsHook + ]; + + build-system = [ setuptools - setuptools-git-versioning ]; pythonRelaxDeps = [ From 43118ee972e824f28cd243140c337459dcb8c3d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 09:33:11 +0200 Subject: [PATCH 15/21] python311Packages.zha: init at 0.0.5 Zigbee Home Automation https://github.com/zigpy/zha --- .../python-modules/zha/default.nix | 126 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 128 insertions(+) create mode 100644 pkgs/development/python-modules/zha/default.nix diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix new file mode 100644 index 000000000000..6e749edb9f25 --- /dev/null +++ b/pkgs/development/python-modules/zha/default.nix @@ -0,0 +1,126 @@ +{ lib +, awesomeversion +, bellows +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +, pyserial-asyncio-fast +, pytest-asyncio +, pytest-timeout +, pytest-xdist +, pytestCheckHook +, python-slugify +, pythonOlder +, pythonRelaxDepsHook +, setuptools +, universal-silabs-flasher +, wheel +, zha-quirks +, zigpy +, zigpy-deconz +, zigpy-xbee +, zigpy-zigate +, zigpy-znp +}: + +buildPythonPackage rec { + pname = "zha"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "zigpy"; + repo = "zha"; + rev = "refs/tags/${version}"; + hash = "sha256-47dlWMzY1vPmHIDCy8a0xzk2G+OPq6vEK5OpP1c8vw4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + pythonRelaxDeps = [ + "universal-silabs-flasher" + "zha-quirks" + ]; + + + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + awesomeversion + bellows + pyserial + pyserial-asyncio + pyserial-asyncio-fast + python-slugify + universal-silabs-flasher + zha-quirks + zigpy + zigpy-deconz + zigpy-xbee + zigpy-zigate + zigpy-znp + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-timeout + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zha" + ]; + + disabledTests = [ + # Tests are long-running and often keep hanging + "test_check_available_no_basic_cluster_handler" + "test_check_available_success" + "test_check_available_unsuccessful" + "test_device_counter_sensors" + "test_device_tracker" + "test_elec_measurement_sensor_polling" + "test_electrical_measurement_init" + "test_group_member_assume_state" + "test_light_refresh" + "test_light" + "test_light" + "test_light" + "test_pollers_skip" + "test_sinope_time" + "test_siren_timed_off" + "test_zha_group_light_entity" + ]; + + disabledTestPaths = [ + "tests/test_cluster_handlers.py" + ]; + + pytestFlagsArray = [ + "-v" + "--timeout=5" + ]; + + meta = with lib; { + description = "Zigbee Home Automation"; + homepage = "https://github.com/zigpy/zha"; + changelog = "https://github.com/zigpy/zha/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f5d6e016b50..79064920c0a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17100,6 +17100,8 @@ self: super: with self; { zfec = callPackage ../development/python-modules/zfec { }; + zha = callPackage ../development/python-modules/zha { }; + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; ziafont = callPackage ../development/python-modules/ziafont { }; From 61b8fc92b396bda3650c003a4cef5d7e52800344 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 Apr 2024 22:39:22 +0200 Subject: [PATCH 16/21] python312Packages.whirlpool-sixth-sense: 0.18.5 -> 0.18.7 https://github.com/abmantis/whirlpool-sixth-sense/compare/refs/tags/0.18.5...0.18.7 --- .../python-modules/whirlpool-sixth-sense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 91c56472e77e..47b90a4c7d44 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.5"; + version = "0.18.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0NJsZex054CWfKX2wyJRd6Cnxa89mNrZN59VqIV2MD8="; + hash = "sha256-M4qOdxR97VhquB85IgimYKZqix2WoRIZcLSIlVK1xDY="; }; nativeBuildInputs = [ From 141dcf1ddccc1297b7e4d85f680b29f339bdf4cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 21:25:09 +0200 Subject: [PATCH 17/21] python311Packages.aionut: init at 4.3.2 Asyncio Network UPS Tools https://github.com/bdraco/aionut --- .../python-modules/aionut/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/aionut/default.nix diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix new file mode 100644 index 000000000000..8c9b8038ce99 --- /dev/null +++ b/pkgs/development/python-modules/aionut/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "aionut"; + version = "4.3.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aionut"; + rev = "refs/tags/v${version}"; + hash = "sha256-QehVC/6RbWp8KnOuVtLFkK8/STTgHXkXmFbSmzu9z7w="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ poetry-core ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aionut" ]; + + meta = with lib; { + description = "Asyncio Network UPS Tools"; + homepage = "https://github.com/bdraco/aionut"; + changelog = "https://github.com/bdraco/aionut/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79064920c0a9..b338ba2b2834 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -327,6 +327,8 @@ self: super: with self; { aionotion = callPackage ../development/python-modules/aionotion { }; + aionut = callPackage ../development/python-modules/aionut { }; + aiooncue = callPackage ../development/python-modules/aiooncue { }; aioopenexchangerates = callPackage ../development/python-modules/aioopenexchangerates { }; From 2707694daa1284b2bc66f8492becc0b219340ad1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 21:36:50 +0200 Subject: [PATCH 18/21] python311Packages.fyta-cli: init at 0.3.4 Module to access the FYTA API https://github.com/dontinelli/fyta_cli --- .../python-modules/fyta-cli/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/fyta-cli/default.nix diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix new file mode 100644 index 000000000000..59e6461b2f3d --- /dev/null +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -0,0 +1,40 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "fyta-cli"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dontinelli"; + repo = "fyta_cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-DqJR8xzR9vBowztji39UtX7UYA8hK+QYKUygPA+v33k="; + }; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "fyta_cli" ]; + + meta = with lib; { + description = "Module to access the FYTA API"; + homepage = "https://github.com/dontinelli/fyta_cli"; + changelog = "https://github.com/dontinelli/fyta_cli/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b338ba2b2834..3e2db663332f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4552,6 +4552,8 @@ self: super: with self; { fx2 = callPackage ../development/python-modules/fx2 { }; + fyta-cli = callPackage ../development/python-modules/fyta-cli { }; + g2pkk = callPackage ../development/python-modules/g2pkk { }; galario = toPythonModule (pkgs.galario.override { From 7d6d820172739b4ddbb0c77fa292bbde840df0f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 Apr 2024 11:48:04 +0200 Subject: [PATCH 19/21] home-assistant: 2024.3.3 -> 2024.4.0 https://www.home-assistant.io/blog/2024/04/03/release-20244/ --- .../home-assistant/component-packages.nix | 162 +++++++++++++----- pkgs/servers/home-assistant/default.nix | 39 +---- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/stubs.nix | 4 +- 4 files changed, 122 insertions(+), 87 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ed225ee308f8..f2a532c6f71a 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 = "2024.3.3"; + version = "2024.4.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -283,7 +283,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ @@ -362,7 +361,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng axis - janus paho-mqtt ]; "azure_devops" = ps: with ps; [ @@ -856,7 +854,6 @@ home-assistant-frontend home-assistant-intents ifaddr - janus mutagen numpy pillow @@ -1056,7 +1053,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng dropmqttapi - janus paho-mqtt ]; "dsmr" = ps: with ps; [ @@ -1066,7 +1062,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ @@ -1096,7 +1091,6 @@ dynalite-panel fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -1183,6 +1177,9 @@ pypca ]; "elvia" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1386,11 +1383,13 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1560,7 +1559,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -1574,13 +1572,15 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt python-fullykiosk ]; "futurenow" = ps: with ps; [ pyfnip ]; + "fyta" = ps: with ps; [ + fyta-cli + ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ @@ -1633,6 +1633,9 @@ "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1917,6 +1920,9 @@ sqlalchemy ]; "history_stats" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1956,7 +1962,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -1978,7 +1983,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2000,7 +2004,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2022,7 +2025,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -2355,7 +2357,6 @@ fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant - janus pillow psutil-home-assistant pyinsteon @@ -2526,6 +2527,9 @@ pykira ]; "kitchen_sink" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -2542,7 +2546,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus knx-frontend pillow psutil-home-assistant @@ -2583,7 +2586,34 @@ "lacrosse_view" = ps: with ps; [ ]; # missing inputs: lacrosse-view "lamarzocco" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr lmcloud + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf ]; "lametric" = ps: with ps; [ aiohttp-cors @@ -2798,7 +2828,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -2839,6 +2868,10 @@ webrtc-noise-gain ]; "lovelace" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + pillow ]; "luci" = ps: with ps; [ openwrt-luci-rpc @@ -2887,7 +2920,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "map" = ps: with ps; [ @@ -2896,7 +2928,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3205,6 +3236,35 @@ psutil-home-assistant sqlalchemy ]; + "motionblinds_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + aioruuvigateway + aioshelly + bleak + bleak-esphome + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + ha-ffmpeg + habluetooth + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: motionblindsble "motioneye" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -3221,35 +3281,30 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "msteams" = ps: with ps; [ @@ -3270,7 +3325,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3281,7 +3335,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt pymysensors ]; @@ -3468,7 +3521,7 @@ "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ - pynut2 + aionut ]; "nutrichef" = ps: with ps; [ ]; @@ -3495,6 +3548,13 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; + "ollama" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + hassil + home-assistant-intents + ]; # missing inputs: ollama-hass "ombi" = ps: with ps; [ pyombi ]; @@ -3505,10 +3565,7 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - fnv-hash-fast pillow - psutil-home-assistant - sqlalchemy ]; "oncue" = ps: with ps; [ aiooncue @@ -3543,9 +3600,6 @@ ]; "openalpr_cloud" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ - numpy - ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ openerz-api ]; @@ -3582,6 +3636,9 @@ pyopnsense ]; "opower" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast opower psutil-home-assistant @@ -3637,7 +3694,6 @@ bellows fnv-hash-fast ifaddr - janus pillow psutil-home-assistant pyroute2 @@ -3676,7 +3732,6 @@ hass-nabucasa hassil home-assistant-intents - janus mutagen paho-mqtt psutil-home-assistant @@ -3704,7 +3759,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3715,7 +3769,6 @@ aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend - janus pillow psutil-home-assistant sqlalchemy @@ -3787,6 +3840,9 @@ webrtc-noise-gain ]; "plant" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4086,6 +4142,9 @@ aiorecollect ]; "recorder" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4100,7 +4159,6 @@ hassil home-assistant-frontend home-assistant-intents - janus mutagen pillow psutil-home-assistant @@ -4390,6 +4448,9 @@ zeroconf ]; "sensor" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4503,6 +4564,7 @@ dbus-fast fnv-hash-fast habluetooth + ifaddr psutil-home-assistant pyserial pyudev @@ -4619,6 +4681,8 @@ ]; "smtp" = ps: with ps; [ ]; + "smud" = ps: with ps; [ + ]; "snapcast" = ps: with ps; [ snapcast ]; @@ -4626,7 +4690,6 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - janus paho-mqtt ]; "snmp" = ps: with ps; [ @@ -4767,6 +4830,9 @@ xmltodict ]; "statistics" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4954,7 +5020,6 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng hatasmota - janus paho-mqtt ]; "tautulli" = ps: with ps; [ @@ -4978,16 +5043,14 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - pysocks python-telegram-bot - ]; + ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "telegram_bot" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng - pysocks python-telegram-bot - ]; + ]; # missing inputs: python-telegram-bot.optional-dependencies.socks "tellduslive" = ps: with ps; [ tellduslive ]; @@ -5106,6 +5169,9 @@ "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pytibber @@ -5805,7 +5871,6 @@ aiohttp-zlib-ng bellows fnv-hash-fast - janus pillow psutil-home-assistant pyserial @@ -6000,6 +6065,7 @@ "dnsip" "doorbird" "dormakaba_dkey" + "downloader" "dremel_3d_printer" "drop_connect" "dsmr" @@ -6080,6 +6146,7 @@ "frontend" "frontier_silicon" "fully_kiosk" + "fyta" "garages_amsterdam" "gardena_bluetooth" "gdacs" @@ -6148,6 +6215,7 @@ "homematic" "homematicip_cloud" "homewizard" + "homeworks" "honeywell" "html5" "http" @@ -6249,6 +6317,7 @@ "mailgun" "manual" "manual_mqtt" + "map" "matrix" "matter" "maxcube" @@ -6430,6 +6499,7 @@ "romy" "roomba" "roon" + "rova" "rpi_power" "rss_feed_template" "rtsp_to_webrtc" @@ -6541,8 +6611,6 @@ "tcp" "technove" "tedee" - "telegram" - "telegram_bot" "tellduslive" "temper" "template" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 797b2ecae5f6..9371bd03aff1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,19 +134,6 @@ let ]; }); - bluecurrent-api = super.bluecurrent-api.overridePythonAttrs (oldAttrs: rec { - version = "1.0.6"; - src = fetchPypi { - pname = "bluecurrent-api"; - inherit version; - hash = "sha256-XHVdtkiG0ff/OY8g+W5iur7OAyhhk1UGA+XUfB2L8/o="; - }; - build-system = oldAttrs.build-system ++ (with self; [ - pythonRelaxDepsHook - ]); - pythonRemoveDeps = [ "asyncio" ]; - }); - debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { # tests are deadlocking too often # https://github.com/NixOS/nixpkgs/issues/262000 @@ -424,26 +411,6 @@ let }; }); - pywaze = super.pywaze.overridePythonAttrs (oldAttrs: rec { - version = "0.5.1"; - src = fetchFromGitHub { - owner = "eifinger"; - repo = "pywaze"; - rev = "refs/tags/v${version}"; - hash = "sha256-r7ROEdgHdjXkveVUbuALHtwCX4IO0lwx9Zo3u6R9I58="; - }; - }); - - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.27"; - src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; - }; - }); - tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { version = "0.5.1"; src = fetchFromGitHub { @@ -541,7 +508,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.3.3"; + hassVersion = "2024.4.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -559,13 +526,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-EutnNqENt1MTmbMe9vtSM+bM5PzvjsfMhpkwXdxWoeI="; + hash = "sha256-Qca6BHeId/fHhIViU7BJhYXxoMxRSeaJQ7CJLmIBmuU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-9i8snvozDKgvcEQfk9KTYfqHxQbDBluvArXYVVnNvnA="; + hash = "sha256-SGXqDjt2wzC/rTAGlV8DSFxauUvIrG3RgOxPCUsAJQ0="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ec699e83164a..47d933077730 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 = "20240307.0"; + version = "20240403.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Wy5TzJ6+Dbkk51TMt9zGIfjI7gMrT4mK0IIRnl4byVE="; + hash = "sha256-kvgyecLgp5KFhwKl4AGhbJeq1mwhR0UVcjeZqaB+6nQ="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index cefdc1f8746a..3707e3f105a6 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 = "2024.3.3"; + version = "2024.4.0"; 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-Qc+pwG87R57wGyCujMQ6qygDOhRh/FoDf1HTRZS3M6s="; + hash = "sha256-5igsxs0/1S0sYlaNxFSsTAo9HkIAqn3XZ031VjAkEQg="; }; nativeBuildInputs = [ From 131ea2631ea82a5149f3c027449f29dd278a5c13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Apr 2024 17:01:56 +0200 Subject: [PATCH 20/21] home-assistant.intents: 2024.3.12 -> 2024.4.3 --- pkgs/servers/home-assistant/intents.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index d0c77694413c..b7b1578033e2 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -9,27 +9,24 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.3.12"; - format = "pyproject"; + version = "2024.4.3"; + format = "wheel"; disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-9oMn5ogHcuopAnXgATu9xlBBBMeWJ9RT5C//xJ5FOBI="; + inherit version format; + pname = "home_assistant_intents"; + dist = "py3"; + python = "py3"; + hash = "sha256-GraYVtioKIoKlPRBhhhzlbBfI6heXAaA1MQpUqAgEDQ="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail \ - 'requires = ["setuptools~=62.3", "wheel~=0.37.1"]' \ - 'requires = ["setuptools"]' - ''; - - nativeBuildInputs = [ + build-system = [ setuptools ]; - # sdist does not ship tests + # sdist/wheel do not ship tests doCheck = false; pytestFlagsArray = [ From 9262c37d59043758a3c85b08be8386e3f2313cec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 6 Apr 2024 17:59:11 +0200 Subject: [PATCH 21/21] sublime-music: disable semver override checks --- pkgs/applications/audio/sublime-music/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index b2cf3a5d842d..2ce12df23dcf 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -26,6 +26,7 @@ let rev = "refs/tags/${version}"; hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; + doCheck = false; # no tests }); dataclasses-json = super.dataclasses-json.overridePythonAttrs (oldAttrs: rec {