diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index ef056f3033b2..f1d0308166cb 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -7,19 +7,15 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.14.9"; + version = "2.15.1"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-UEGRZBegoAnls5xAyVgjisD0B8nu8kXp1XHI4A114lw="; + pname = "music_assistant_frontend"; + inherit version; + hash = "sha256-l6SKBMqP2FrjVUmywDXf0I4Te0qbzufUVR7frWAzrks="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "~=" ">=" - ''; - build-system = [ setuptools ]; doCheck = false; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index f56a60fc09d3..ead07456c2cc 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -48,14 +48,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.5.2"; + version = "2.5.5"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-RkbU2MqQ7XSv7f6gvgS0AZ8jy63fUAomC41dEk8qyOI="; + hash = "sha256-v9xFUjjk7KHsUtuZjQWLtc1m3f6VOUPlQtSBtUR6Pcg="; }; patches = [ @@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec { with python.pkgs; [ aiohttp + chardet mashumaro orjson ] @@ -149,11 +150,13 @@ python.pkgs.buildPythonApplication rec { ++ (providerPackages.jellyfin python.pkgs) ++ (providerPackages.opensubsonic python.pkgs); - pytestFlagsArray = [ + disabledTestPaths = [ # 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" + "tests/providers/jellyfin/test_init.py::test_initial_sync" + "tests/core/test_server_base.py::test_start_and_stop_server" + "tests/core/test_server_base.py::test_events" + # not compatible with the required py-subsonic version + "tests/providers/opensubsonic/test_parsers.py" ]; pythonImportsCheck = [ "music_assistant" ]; diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 29c10738db94..b86f4de81aca 100644 --- 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.5.2"; + version = "2.5.5"; providers = { airplay = ps: [ ]; diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index 393dbca9500a..fb1825fdc233 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i python3 -p "music-assistant.python.withPackages (ps: music-assistant.dependencies ++ (with ps; [ jinja2 packaging ]))" -p pyright ruff isort +#!nix-shell -I nixpkgs=./. -i python3 -p "music-assistant.python.withPackages (ps: music-assistant.dependencies ++ (with ps; [ jinja2 packaging ]))" -p nixfmt pyright ruff isort import asyncio import json import os.path