From 8a631f2aa31d2fc02bdced2a3f492df2c8313b09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:20:08 +0100 Subject: [PATCH 1/9] python312Packages.pysuez: drop Duplicate of pysuezv2. --- .../python-modules/pysuez/default.nix | 41 ------------------- .../home-assistant/component-packages.nix | 2 +- .../update-component-packages.py | 1 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/pysuez/default.nix diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix deleted file mode 100644 index b4ffa898f9e4..000000000000 --- a/pkgs/development/python-modules/pysuez/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - hatchling, - aiohttp, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "pysuez"; - version = "2.0.3"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "jb101010-2"; - repo = "pySuez"; - tag = version; - hash = "sha256-D/XsJL393fDIKMB1Wyzods5hLsdU3Qgq8T5aTJ3SLrM="; - }; - - build-system = [ hatchling ]; - - dependencies = [ aiohttp ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "pysuez" ]; - - meta = with lib; { - description = "Module to get water consumption data from Suez"; - mainProgram = "pysuez"; - homepage = "https://github.com/jb101010-2/pySuez"; - changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3d52e828800d..93c296802c14 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5427,7 +5427,7 @@ ]; "suez_water" = ps: with ps; [ - pysuez + pysuezv2 ]; "sun" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 747880254965..a6433c9b96b4 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -45,7 +45,6 @@ PKG_PREFERENCES = { "numpy": "numpy", "ollama-hass": "ollama", "paho-mqtt": "paho-mqtt", - "pysuezV2": "pysuez", "sentry-sdk": "sentry-sdk", "slackclient": "slack-sdk", "SQLAlchemy": "sqlalchemy", diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ccf71248b1fc..ae5fdce752b2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 PyStemmer = pystemmer; # added 2023-02-19 + pysuez = pysuezv2; # added 2025-03-14 pytado = python-tado; # added 2024-12-02 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53242b64023c..3772f9bda112 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11021,8 +11021,6 @@ self: super: with self; { pysubs2 = callPackage ../development/python-modules/pysubs2 { }; - pysuez = callPackage ../development/python-modules/pysuez { }; - pysuezv2 = callPackage ../development/python-modules/pysuezv2 { }; pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { }; From 5af3c15445cd6f6f640f5fd0fabe4220c141b1ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:23:23 +0100 Subject: [PATCH 2/9] python313Packages.tesla-fleet-api: 0.9.12 -> 0.9.13 https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v0.9.13 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 69c85b072cfe..0118c7ca0a27 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.9.12"; + version = "0.9.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-1ir1x/uvcVoad82KaGAMm/S52MT7E5SkiTnUH2cWV34="; + hash = "sha256-Q+nALf5SBDjh6s6d8lZhFVIkz0vGvzRD8OgXX6v8mJY="; }; build-system = [ setuptools ]; From 4195d3baf33323f8452e73c1b0e5f3a6057578cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:23:43 +0100 Subject: [PATCH 3/9] python313Packages.velbus-aio: 2025.3.0 -> 2025.3.1 https://github.com/Cereal2nd/velbus-aio/releases/tag/2025.3.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 661c71ab73a7..6e6360e7ddd7 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2025.3.0"; + version = "2025.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; tag = version; - hash = "sha256-hcVKJq+3cnhHtYc27lAj92CHzW3woCxU9dJ5lvj5Kgc="; + hash = "sha256-4lfxY8+EUtTAyRB40p+nShzmC3Qbxu6MJn9Zo7bImyk="; fetchSubmodules = true; }; From 40bd05d4bbb2378d5351b720e75847f14ce086c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:24:01 +0100 Subject: [PATCH 4/9] python313Packages.xknxproject: 3.8.1 -> 3.8.2 https://github.com/XKNX/xknxproject/releases/tag/3.8.2 --- pkgs/development/python-modules/xknxproject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 1430a701141b..8d9a0a3b885c 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.8.1"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; tag = version; - hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM="; + hash = "sha256-EIonCsolfAAFQpHuSFUuYAAZozjtqSwJCpw86Cc2d4I="; }; build-system = [ setuptools ]; From 65efff79ee84ab3b4ba168249ae322085e528c3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:24:12 +0100 Subject: [PATCH 5/9] home-assistant: 2025.3.2 -> 2025.3.3 https://github.com/home-assistant/core/releases/tag/2025.3.3 --- 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 93c296802c14..fc49fd60d8db 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 = "2025.3.2"; + version = "2025.3.3"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 20939aab7546..42c6db165bc8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -393,7 +393,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.3.2"; + hassVersion = "2025.3.3"; in python.pkgs.buildPythonApplication rec { @@ -414,13 +414,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-iL0yzgYlPIhdNEKwxCVqe1M1co+z7AMArbtxA0KJQoo="; + hash = "sha256-uWNK7izeaK5XZMNfDgq/npJ1PrmC/HYHvHc5NU7Rff8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-21WtUbqhsxv2DEy63zZ7dPGP+UE+snln3wLGbtICGDQ="; + hash = "sha256-axmqJRiOt5T8gr/eh7qXOQBMLrcR9ZSqLS8SlmTgkE8="; }; build-system = with python.pkgs; [ From 9d1710abf64f6e7c87839e6a86451a0e1b773a50 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:31:16 +0100 Subject: [PATCH 6/9] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.222 -> 0.13.223 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.223/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index a92f6174345b..1830ed38cbd9 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.222"; + version = "0.13.223"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-a7bRxG2rDfxJ/1kfPQFXLaGxlGS6vuxADbJhs5qytkM="; + hash = "sha256-mt8byu88r76cVkZlu8LSiInm/jwboauo6YblY2aTulA="; }; build-system = [ setuptools ]; From 3e43a042a7f8f0adca6e0b93ed200d05f57fc1e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:32:05 +0100 Subject: [PATCH 7/9] home-assistant-custom-components.dirigera_platform: 2.6.6 -> 2.6.8 https://github.com/sanjoyg/dirigera_platform/compare/2.6.6...2.6.8 --- .../custom-components/dirigera_platform/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix index 095fd4b5cd8c..43fff7a6fde3 100644 --- a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "sanjoyg"; domain = "dirigera_platform"; - version = "2.6.6"; + version = "2.6.8"; src = fetchFromGitHub { owner = "sanjoyg"; repo = "dirigera_platform"; rev = version; - hash = "sha256-OoTmEVjo6pzFQ5uoZOcmpOhVUoM2DM8HBAvJA58zjAU="; + hash = "sha256-FNcGl6INQlVP+P3qmExWLI1ALh9ZacjJAbNKRtgM3ms="; }; postPatch = '' From f708af830fde13b5058811a59ec32cb863f788ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:32:11 +0100 Subject: [PATCH 8/9] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.3.3 -> 7.3.5 https://github.com/dermotduffy/advanced-camera-card/releases/tag/v7.3.5 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index f742470bf178..f12d302f12cd 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.3.3"; + version = "7.3.5"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-4qsOSfO8a2Wq+kO2l2CbjsEOM+pd4/ofcu41smnlV3E="; + hash = "sha256-DpQHSHZ+jmaUjepbUYiGJJ3d7xu2mj15Tts6DAXY4Ng="; }; # TODO: build from source once yarn berry support lands in nixpkgs From f0401eb26c75ecf026b2d6944584885674fd0cc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 13:59:36 +0100 Subject: [PATCH 9/9] python313Packages.homeassistant-stubs: 2025.3.2 -> 2025.3.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.3.3 --- 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 8eb453c9b4b3..21ad2e622052 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.3.2"; + version = "2025.3.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-aUkXbAyuyL8iZuWxFwVJNNYA6ANK8R2UrV5bA7MCLZc="; + hash = "sha256-SI43zL0DfXGfk/A8VhoUTq+3Q4N2730vBxEXRj8fgUI="; }; build-system = [