home-assistant: 2025.1.4 -> 2025.2.0 (#379685)

NixOS · Feb 6, 2025 · 4bc83dc · 4bc83dc
2 parents 4df2994 + 58fa7e7
commit 4bc83dc
Show file tree

Hide file tree

Showing 93 changed files with 942 additions and 419 deletions.
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
@@ -12,7 +12,34 @@ let
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
+      aiojellyfin = super.aiojellyfin.overridePythonAttrs (oldAttrs: rec {
+        version = "0.10.1";
+
+        src = fetchFromGitHub {
+          owner = "Jc2k";
+          repo = "aiojellyfin";
+          tag = "v${version}";
+          hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8=";
+        };
+      });
+
       music-assistant-frontend = self.callPackage ./frontend.nix { };
+
+      music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec {
+        version = "1.1.4";
+
+        src = fetchFromGitHub {
+          owner = "music-assistant";
+          repo = "models";
+          tag = version;
+          hash = "sha256-keig18o32X53q/QcoaPO0o9AT4XTEZ+dQ3L6u6BVkLU=";
+        };
+
+        postPatch = ''
+          substituteInPlace pyproject.toml \
+            --replace-fail "0.0.0" "${version}"
+        '';
+      });
     };
   };
 
@@ -27,14 +54,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.3.4";
+  version = "2.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-HV2R5zMTao8akUNZMGRKbU8BIxWmdjKFLsGMqA5cfBs=";
+    hash = "sha256-CSGpG1E4ou1TGz/S1mXFHyk49p7dStEwxUTB+xxfNEc=";
   };
 
   patches = [
@@ -58,6 +85,7 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "aiohttp"
+    "certifi"
     "colorlog"
     "cryptography"
     "mashumaro"
@@ -111,15 +139,18 @@ python.pkgs.buildPythonApplication rec {
       aiojellyfin
       pytest-aiohttp
       pytest-cov-stub
+      pytest-timeout
       pytestCheckHook
       syrupy
       pytest-timeout
     ]
     ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pytestFlagsArray = [
-    # blocks in setup
-    "--deselect=tests/server/providers/jellyfin/test_init.py::test_initial_sync"
+    # blocks in poll()
+    "--deselect=tests/providers/jellyfin/test_init.py::test_initial_sync"
+    "--deselect=tests/core/test_server_base.py::test_start_and_stop_server"
+    "--deselect=tests/core/test_server_base.py::test_events"
   ];
 
   pythonImportsCheck = [ "music_assistant" ];

diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.3.4";
+  version = "2.3.6";
   providers = {
     airplay = ps: [
     ];

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2025.1.0";
+  version = "2025.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = version;
-    hash = "sha256-MEZdYOpBAHmWidzq+7SpEFsHNYlSaIQ4utnGK9Y3/NE=";
+    hash = "sha256-5/NG3VMJfLOCQDqnP1LVRJlT08LDITlZZFb3aYjtm5I=";
   };
 
   postPatch = ''

diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aiodhcpwatcher";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodhcpwatcher";
     rev = "v${version}";
-    hash = "sha256-KZL5DejzDmizvvMUNfkFltl1xXz+2jX/3DVj60x6xOk=";
+    hash = "sha256-/4x+FhKCEIpmFSTC5PIEe4QsYojrvx4Wlf7+WUvSHu8=";
   };
 
   postPatch = ''
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     description = "Watch for DHCP packets with asyncio";
     homepage = "https://github.com/bdraco/aiodhcpwatcher";
     changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl3Only;
+    license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
     platforms = platforms.linux;
   };

diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix
@@ -3,39 +3,45 @@
   aiohttp,
   async-timeout,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
+  pytest-cov-stub,
+  pytestCheckHook,
+  setuptools,
   slixmpp,
 }:
 
 buildPythonPackage rec {
   pname = "aioharmony";
-  version = "0.2.10";
-  format = "setuptools";
+  version = "0.4.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-18+38QunEdEGdirQOT+528vYqiqDuUr/CWRQtXKf4rs=";
+  src = fetchFromGitHub {
+    owner = "Harmony-Libs";
+    repo = "aioharmony";
+    tag = "v${version}";
+    hash = "sha256-X7oL4jokomNLhBEp4z8t11Yv/4pNDnqFurPmChXUU3o=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     async-timeout
     slixmpp
   ];
 
-  # aioharmony does not seem to include tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "aioharmony.harmonyapi"
     "aioharmony.harmonyclient"
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/ehendrix23/aioharmony";
+    homepage = "https://github.com/Harmony-Libs/aioharmony";
     description = "Python library for interacting the Logitech Harmony devices";
     mainProgram = "aioharmony";
     license = licenses.asl20;

diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix
@@ -3,7 +3,7 @@
   aiohttp,
   aioresponses,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   mashumaro,
   orjson,
   pytest-aiohttp,
@@ -17,18 +17,21 @@
 
 buildPythonPackage rec {
   pname = "aiohasupervisor";
-  version = "0.2.2b5";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-EFVhR7L+1SVzXO4UpDrXA1EuPdeew55CV4ykO3K5BFI=";
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-supervisor-client";
+    tag = version;
+    hash = "sha256-72YRaTlgRJ8liQ1q+Hx1iCG8Av7wWk61t306fYT9gss=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"' \
       --replace-fail "setuptools~=68.0.0" "setuptools>=68.0.0" \
       --replace-fail "wheel~=0.40.0" "wheel>=0.40.0"
   '';
@@ -56,6 +59,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aiohasupervisor" ];
 
   meta = {
+    changelog = "https://github.com/home-assistant-libs/python-supervisor-client/releases/tag/${src.tag}";
     description = "Client for Home Assistant Supervisor";
     homepage = "https://github.com/home-assistant-libs/python-supervisor-client";
     license = lib.licenses.asl20;

diff --git a/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix b/pkgs/development/python-modules/aiohttp-asyncmdnsresolver/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  aiodns,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  zeroconf,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp-asyncmdnsresolver";
+  version = "0.0.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "aio-libs";
+    repo = "aiohttp-asyncmdnsresolver";
+    rev = "v${version}";
+    hash = "sha256-YtBPMhRbilLY0VV1qVIPBYT0w91MbsUo2nbr4ODgCZA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiodns
+    aiohttp
+    zeroconf
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiohttp_asyncmdnsresolver" ];
+
+  meta = {
+    description = "Module to resolve mDNS with aiohttp";
+    homepage = "https://github.com/aio-libs/aiohttp-asyncmdnsresolver";
+    changelog = "https://github.com/aio-libs/aiohttp-asyncmdnsresolver/blob/${src.rev}/CHANGES.rst";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
   };
 
+  postPatch = ''
+    substituteInPlace aiomodernforms/modernforms.py --replace-fail \
+      "with async_timeout.timeout(self._request_timeout):" \
+      "async with async_timeout.timeout(self._request_timeout):"
+  '';
+
   propagatedBuildInputs = [
     aiohttp
     backoff

diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix
@@ -3,7 +3,7 @@
   anyio,
   buildPythonPackage,
   fetchFromGitHub,
-  paho-mqtt_2,
+  paho-mqtt,
   poetry-core,
   poetry-dynamic-versioning,
   pytestCheckHook,
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    paho-mqtt_2
+    paho-mqtt
     typing-extensions
   ];
 
@@ -48,6 +48,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    broken = lib.versionOlder "paho-mqtt" "2";
     description = "Idiomatic asyncio MQTT client, wrapped around paho-mqtt";
     homepage = "https://github.com/sbtinstruments/aiomqtt";
     changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.tag}/CHANGELOG.md";

diff --git a/pkgs/development/python-modules/aiortsp/default.nix b/pkgs/development/python-modules/aiortsp/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
+  disabledTestPaths = [
+    # these tests get stuck, could be pytest-asyncio compat issue
+    "tests/test_connection.py"
+  ];
+
   pythonImportsCheck = [ "aiortsp" ];
 
   meta = with lib; {

diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -13,6 +13,7 @@
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
+  pytz,
   time-machine,
 }:
 
@@ -52,6 +53,7 @@ buildPythonPackage rec {
     pytest-mockservers
     pytest-resource-path
     pytestCheckHook
+    pytz
     time-machine
   ];
 

diff --git a/pkgs/development/python-modules/aiousbwatcher/default.nix b/pkgs/development/python-modules/aiousbwatcher/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  asyncinotify,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "aiousbwatcher";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Bluetooth-Devices";
+    repo = "aiousbwatcher";
+    tag = "v${version}";
+    hash = "sha256-M9MUaB3oHELHdtgaWri9nILnVQpF2FJvHrL68jXeOqg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ asyncinotify ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiousbwatcher" ];
+
+  meta = {
+    description = "Watch for USB devices to be plugged and unplugged";
+    homepage = "https://github.com/Bluetooth-Devices/aiousbwatcher";
+    changelog = "https://github.com/Bluetooth-Devices/aiousbwatcher/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}