From a1da551a7c158d6f02f2322738188e9d6d69e421 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 14 Nov 2025 18:25:18 +0100
Subject: [PATCH 1/2] music-assistant: fix `pytestCheckPhase` by pinning to
 `ffmpeg_7`

Upstream only officially supports ffmpeg 6.1 and 7 and is not yet
compatible with ffmpeg_8.

https://hydra.nixos.org/build/313189441

https://github.com/music-assistant/server/blob/2.6.2/Dockerfile.base#L23-L25

https://github.com/music-assistant/server/blob/2.6.2/DEVELOPMENT.md?plain=1#L5

Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 pkgs/by-name/mu/music-assistant/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index d85831328d30..01fdcd891f5c 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -2,7 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
-  ffmpeg-headless,
+  ffmpeg_7-headless,
   nixosTests,
   replaceVars,
   providers ? [ ],
@@ -59,8 +59,8 @@ python.pkgs.buildPythonApplication rec {
 
   patches = [
     (replaceVars ./ffmpeg.patch {
-      ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
-      ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe";
+      ffmpeg = "${lib.getBin ffmpeg_7-headless}/bin/ffmpeg";
+      ffprobe = "${lib.getBin ffmpeg_7-headless}/bin/ffprobe";
     })
 
     # Look up librespot from PATH at runtime

From 25beb9782f21cec006de79b3c6e448ba80303f20 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 14 Nov 2025 18:53:05 +0100
Subject: [PATCH 2/2] music-assistant: 2.6.2 -> 2.6.3

This release is more or less meaningless for us, as it only really added
deno for yt-dlp used by the YTMusic provider, which we already address
in our own yt-dlp packaging.

https://github.com/music-assistant/server/releases/tag/2.6.3

diff: https://github.com/music-assistant/server/compare/2.6.2...2.6.3
---
 pkgs/by-name/mu/music-assistant/package.nix   | 4 ++--
 pkgs/by-name/mu/music-assistant/providers.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index 01fdcd891f5c..065f6ee4c0a6 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -47,14 +47,14 @@ assert
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.6.2";
+  version = "2.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-mNSTXMQDG5LiP3Bv9GGy2AO1bQfpFLH8tSCOB/wAzOU=";
+    hash = "sha256-vvhynBor5tj5n53Dm3K4ZOkFZ5LM7bFevOCdZjJsbbM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 97344f585851..a80079c45771 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.6.2";
+  version = "2.6.3";
   providers = {
     airplay = ps: [
     ];
@@ -150,6 +150,6 @@
         duration-parser
         yt-dlp
         ytmusicapi
-      ];
+      ]; # missing deno
   };
 }