Merge remote-tracking branch 'origin/staging-next' into staging

pkgs/development/python-modules/aioairzone/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.9.9";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone";
     tag = version;
-    hash = "sha256-K/QzoN08keaD5+o5HrKOwrNfIugg1GONdwT7RycOM18=";
+    hash = "sha256-/ZzswdGGA4IGc7djTuSIzLtBLA9oRhJBQHMBUlPci7o=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/aioesphomeapi/default.nix

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "29.8.0";
+  version = "29.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-hX0OOgLnaZOreBfb8ptNkNLzUn+S38/84DfJD423RAM=";
+    hash = "sha256-Wk2WxyyU8SUsBu99sj1LNNzQYspC3eLy1tPXSjk2UxQ=";
   };
 
   build-system = [

pkgs/development/python-modules/aioshelly/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "13.4.0";
+  version = "13.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-sGcI8+y/l8meYmlerWC2cEhW+LMKnZpoCw4ZWG26c6g=";
+    hash = "sha256-1QefCtEjbcvH+VIIoTBbyuMbkPj7z5YtYROFpj2VtH0=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/azure-mgmt-kusto/default.nix

@@ -17,7 +17,8 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "azure_mgmt_kusto";
+    inherit version;
     hash = "sha256-K8keApefYp/u7cTZuWNYhltVlFethunG+ccJpAgyDmM=";
   };
 

pkgs/development/python-modules/commoncode/default.nix

@@ -33,6 +33,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
+  pythonRelaxDeps = [ "beautifulsoup4" ];
+
   dependencies = [
     attrs
     beautifulsoup4

pkgs/development/python-modules/dbt-adapters/default.nix

@@ -24,11 +24,6 @@ buildPythonPackage rec {
     hash = "sha256-6UYXUGZIzHYxd8J+avmnIfdigtgoVU0lE28ng2b0Q8M=";
   };
 
-  postPatch = ''
-    mkdir src
-    mv dbt src
-  '';
-
   build-system = [ hatchling ];
 
   pythonRelaxDeps = [

pkgs/development/python-modules/flask-pymongo/default.nix

@@ -2,11 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
-  vcversioner,
+  hatchling,
   flask,
   pymongo,
-  six,
   pytestCheckHook,
 }:
 
@@ -16,20 +14,16 @@ buildPythonPackage rec {
   pyproject = true;
 
   src = fetchPypi {
-    pname = "Flask-PyMongo";
+    pname = "flask_pymongo";
     inherit version;
     hash = "sha256-0iW1HCHOyi5nDmzKebXFhK0XuWJStI6E47Qj3bczBMw=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    vcversioner
-  ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     flask
     pymongo
-    six
   ];
 
   pythonImportsCheck = [ "flask_pymongo" ];

pkgs/development/python-modules/gcal-sync/default.nix

@@ -3,6 +3,7 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   freezegun,
   ical,
   pydantic,
@@ -27,6 +28,15 @@ buildPythonPackage rec {
     hash = "sha256-8VUXW6tIX43TV7UIxeforZIxAUqGY9uqpz6WGyH4d8E=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ical-v9-compat.patch";
+      url = "https://github.com/allenporter/gcal_sync/commit/7ce4b4214568764c234bff179cf05f7e03e21c1b.patch";
+      hash = "sha256-OKFOl1uSCFECbZJe5/J+9oD3fpX/sRM1zPgJ+fmBqPg=";
+      excludes = [ "requirements_dev.txt" ];
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

pkgs/development/python-modules/ical/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "ical";
-  version = "9.0.3";
+  version = "9.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "ical";
     tag = version;
-    hash = "sha256-f2MGG+E6YxziEK4eGoyPBfp/HVVF7qV3yU8N2uw4Lnc=";
+    hash = "sha256-E5CIvjWi18E8PYuOsXhsQempa2pPw1frSWK+/R3UqmQ=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/livisi/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "livisi";
-  version = "0.0.24";
+  version = "0.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "planbnet";
     repo = "livisi";
     tag = "v${version}";
-    hash = "sha256-ggEbzN9FfqT968hgOblIh5dfVibzgUEc4SoZfBGOCwo=";
+    hash = "sha256-kEkbuZmYzxhrbTdo7eZJYu2N2uJtfspgqepplXvSXFg=";
   };
 
   pythonRelaxDeps = [ "colorlog" ];

pkgs/development/python-modules/opower/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.10.1";
+  version = "0.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-egkXrTKqUz6AiOr55QRUTkz/3CnhTO2GeBDcd40QGvQ=";
+    hash = "sha256-8wUzv5iUKunWu2wR8abw28vQxqrhPVxsIsFhpI1uBbM=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/piano-transcription-inference/default.nix

@@ -7,6 +7,7 @@
   librosa,
   matplotlib,
   mido,
+  setuptools,
   torch,
   torchlibrosa,
 }:
@@ -14,10 +15,11 @@
 buildPythonPackage rec {
   pname = "piano-transcription-inference";
   version = "0.0.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "piano_transcription_inference";
+    inherit version;
     hash = "sha256-tt0A+bS8rLYUByXwO0E5peD0rNNaaeSSpdH3NOz70jE=";
   };
 
@@ -29,7 +31,9 @@ buildPythonPackage rec {
     hash = "sha256-w/qXMHJb9Kdi8cFLyAzVmG6s2gGwJvWkolJc1geHYUE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     librosa
     matplotlib
     mido

pkgs/development/python-modules/psygnal/default.nix

@@ -29,12 +29,12 @@ buildPythonPackage rec {
     hash = "sha256-eGJWtmw2Ps3jII4T8E6s3djzxfqcSdyPemvejal0cn4=";
   };
 
-  buildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mypy-extensions
     typing-extensions
   ];
@@ -48,6 +48,11 @@ buildPythonPackage rec {
     attrs
   ];
 
+  pytestFlagsArray = [
+    "-W"
+    "ignore::pydantic.warnings.PydanticDeprecatedSince211"
+  ];
+
   pythonImportsCheck = [ "psygnal" ];
 
   meta = with lib; {

pkgs/development/python-modules/pytest-testinfra/default.nix

@@ -3,13 +3,14 @@
   ansible-core,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
+  hatch-vcs,
   paramiko,
   pytest-xdist,
   pytestCheckHook,
   pythonOlder,
   pywinrm,
   salt,
-  setuptools-scm,
 }:
 
 buildPythonPackage rec {
@@ -20,11 +21,15 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "pytest_testinfra";
+    inherit version;
     hash = "sha256-U3/V64jaYYwfRhJIqiBZTPjURRLoUZsjmDfoOHXh6c0=";
   };
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   nativeCheckInputs = [
     ansible-core
@@ -35,14 +40,8 @@ buildPythonPackage rec {
     salt
   ];
 
-  # Markers don't get added when docker is not available (leads to warnings):
-  # https://github.com/pytest-dev/pytest-testinfra/blob/9.0.0/test/conftest.py#L223
   preCheck = ''
     export HOME=$(mktemp -d)
-    sed -i '54imarkers = \
-    \ttestinfra_hosts(host_selector): mark test to run on selected hosts \
-    \tdestructive: mark test as destructive \
-    \tskip_wsl: skip test on WSL, no systemd support' setup.cfg
   '';
 
   disabledTests = [

pkgs/development/python-modules/pyvicare/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.43.1";
+  version = "2.44.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openviess";
     repo = "PyViCare";
     tag = version;
-    hash = "sha256-dVUb3v8r+1Kkh6BCWtny1F2vzynSRijT62OnrQCTTao=";
+    hash = "sha256-R7GhMiE4gXCTQkew7meSkMBGSdZlTKd9X2A1zEgC8ng=";
   };
 
   postPatch = ''

pkgs/development/python-modules/reolink-aio/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-sDTC+tjgEc6SQ4G+MWILYXHcJAPIoRo7GttmGAnp4R8=";
+    hash = "sha256-yEv04y8mkXRmxGmK0UXBRcFdmyAg2xEXYYB0X+0zkao=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/s3fs/default.nix

@@ -34,6 +34,8 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  pythonRelaxDeps = [ "fsspec" ];
+
   dependencies = [
     aiobotocore
     fsspec

pkgs/development/python-modules/sharkiq/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sharkiq";
-  version = "1.0.2";
+  version = "1.1.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "JeffResc";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA=";
+    hash = "sha256-adSBFH5nGVPo7OBMak6rN5HA5uMKZCqnIVXBnR7REgQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/willow/default.nix

@@ -49,6 +49,11 @@ buildPythonPackage rec {
     wand
   ] ++ optional-dependencies.heif;
 
+  disabledTests = [
+    # ValueError: Invalid quality setting
+    "test_save_avif_lossless"
+  ];
+
   meta = with lib; {
     description = "Python image library that sits on top of Pillow, Wand and OpenCV";
     homepage = "https://github.com/torchbox/Willow/";

pkgs/development/python-modules/zodbpickle/default.nix

@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "setuptools<74" "setuptools"
+      --replace-fail "setuptools <= 75.6.0" "setuptools"
   '';
 
   build-system = [ setuptools ];
@@ -30,6 +30,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  preCheck = ''
+    mv src/zodbpickle/tests ./.
+    rm -rf src
+  '';
+
   # fails..
   disabledTests = [
     "test_dump"

pkgs/development/python-modules/zope-security/default.nix

@@ -14,6 +14,7 @@
   btrees,
   unittestCheckHook,
   zope-exceptions,
+  zope-testing,
 }:
 
 buildPythonPackage rec {
@@ -56,7 +57,8 @@ buildPythonPackage rec {
     btrees
     unittestCheckHook
     zope-exceptions
-  ];
+    zope-testing
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   # Import process is too complex and some tests fail
   preCheck = ''

pkgs/development/python-modules/zope-size/default.nix

@@ -1,12 +1,13 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   zope-i18nmessageid,
   zope-interface,
   unittestCheckHook,
   zope-component,
+  zope-configuration,
   zope-security,
 }:
 
@@ -15,12 +16,18 @@ buildPythonPackage rec {
   version = "5.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "zope.size";
-    inherit version;
-    hash = "sha256-88OaPLxG6AnxlkGxLaFn6nzbPgWu8z9WmXOireHvgAk=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.size";
+    tag = version;
+    hash = "sha256-9r7l3RgE9gvxJ2I5rFvNn/XIztecXW3GseGeM3MzfTU=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools <= 75.6.0" setuptools
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -33,6 +40,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     unittestCheckHook
     zope-component
+    zope-configuration
     zope-security
   ];
 

pkgs/development/web/playwright/webkit.nix

@@ -80,7 +80,7 @@ let
         hash = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds=";
       };
       postPatch = "";
-      patches = [];
+      patches = [ ];
     }
   );
 

pkgs/servers/home-assistant/component-packages.nix

@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.4.1";
+  version = "2025.4.2";
   components = {
     "3_day_blinds" =
       ps: with ps; [

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.4.1";
+  hassVersion = "2025.4.2";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -414,13 +414,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-h+PqVBEWBZu56opMxtAhQyIwLafyQP6uilqojuDJ/k0=";
+    hash = "sha256-7OwkZ2KF1IxSNCXvr7Ex0nIKWWr78Zvma2WGaKM5cJE=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-7HHL2fkAOw7cgJT6oy7ICjltiBop37dyMCTA+WNypQ8=";
+    hash = "sha256-IBJxyPZgFrCiARgOzYEcC6Eu/hwoOFTH87lkb+6UYJ4=";
   };
 
   build-system = with python.pkgs; [

pkgs/servers/home-assistant/frontend.nix

@@ -8,7 +8,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 = "20250404.0";
+  version = "20250411.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-og/8P3wh5ztjpQJhI+pF/YHKeNjz/AOoCzxGQRl0Aac=";
+    hash = "sha256-oVvYSEvkJ2bvmoC4DHEUi4EE9iOBn3dJyUnyObWSx1k=";
   };
 
   # there is nothing to strip in this package

pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.232";
+  version = "0.13.233";
   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-LHdkU89YzILPZFf/EgnCdPCG4tk1s5V7tpDsNtEaAak=";
+    hash = "sha256-Yi865ZCK1Rr9Nto0HpqRqwCE6t/UPLR8lqfPv0P+bcs=";
   };
 
   build-system = [ setuptools ];

pkgs/servers/home-assistant/stubs.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.3.4";
+  version = "2025.4.2";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-HO1A1uLGNnFdigmoZVL+T28f1Oh+6t1pDUa+nh84MLA=";
+    hash = "sha256-SFMGBPVjgoLkPlYHuTKZLbhTMbKGEeE1wYsFJ0ssbgg=";
   };
 
   build-system = [