From 67ccbd4dc70a8c98c9feed52deebbcee29f96b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Mar 2026 01:03:49 +0100 Subject: [PATCH] python3Packages.music-assistant-models: convert to finalAttrs, test music-assistant in passthru.tests --- pkgs/by-name/mu/music-assistant/package.nix | 12 ++---------- .../music-assistant-models/default.nix | 15 ++++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 11bdffe8ba1e..2421604aae3e 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -14,20 +14,12 @@ let packageOverrides = self: super: { music-assistant-frontend = self.callPackage ./frontend.nix { }; - music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec { + music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: { version = "1.1.86"; - src = fetchFromGitHub { - owner = "music-assistant"; - repo = "models"; - tag = version; + src = oldAttrs.src.override { hash = "sha256-dQwFsuelp/3s2CO/5jxNrZcmWxE9xYhrpx0O37Tq/TQ="; }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" - ''; }); }; }; diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index 2f9ebf8addda..74607350c725 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -15,10 +15,11 @@ pytest-cov-stub, # reverse dependencies + music-assistant, music-assistant-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "music-assistant-models"; # Must be compatible with music-assistant-client package # nixpkgs-update: no auto update @@ -28,13 +29,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/eNCgAB5G8g1r2fcW27lySEqg+q/1bJvwwyntigGWjo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" + --replace-fail "0.0.0" "${finalAttrs.version}" ''; build-system = [ setuptools ]; @@ -54,14 +55,14 @@ buildPythonPackage rec { ]; passthru.tests = { - inherit music-assistant-client; + inherit music-assistant music-assistant-client; }; meta = { - description = "Models used by Music Assistant (shared by client and server"; + description = "Models used by Music Assistant (shared by client and server)"; homepage = "https://github.com/music-assistant/models"; - changelog = "https://github.com/music-assistant/models/releases/tag/${src.tag}"; + changelog = "https://github.com/music-assistant/models/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +})