From ca94e8528c367de289d3b475720a74fc76626f44 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 22 Aug 2024 01:54:18 +0200
Subject: [PATCH] music-assistant: 2.1.1 -> 2.2.0

https://github.com/music-assistant/server/releases/tag/2.2.0
---
 pkgs/by-name/mu/music-assistant/frontend.nix  |  4 ++--
 pkgs/by-name/mu/music-assistant/package.nix   | 17 ++---------------
 pkgs/by-name/mu/music-assistant/providers.nix |  7 +++++--
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index b889fe359618..cd7c6793b5f2 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-frontend";
-  version = "2.7.0";
+  version = "2.8.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KrloxxdqIwQ5NsxAGm28D5StHnw9LTqDDtcchD5X5Qk=";
+    hash = "sha256-L7ASmYtJja+Hy4MnGrNWIwSjvhfq2iXfWm4gGKAnEec=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index c40ccf1a6716..73845eec3bc4 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -11,19 +11,6 @@ let
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
-      aiojellyfin = super.aiojellyfin.overridePythonAttrs rec {
-        version = "0.9.2";
-
-        src = fetchFromGitHub {
-          owner = "jc2k";
-          repo = "aiojellyfin";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-q+b1tKr46qq3PULPkCaQk2VoC1aaNxPK/E1Kj4PABfI=";
-        };
-
-        doCheck = false;
-      };
-
       music-assistant-frontend = self.callPackage ./frontend.nix { };
     };
   };
@@ -37,14 +24,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.1.1";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     rev = "refs/tags/${version}";
-    hash = "sha256-ALsl2xfAFYejDEhR5/ZpeIxoHFgvz471tb4OP5xQAUE=";
+    hash = "sha256-GQvbkdyybJ3X09fCKwu+iZvq7UdHIMzCpYjenGg/zQA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 702dadf127dd..4e50e3fcf045 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.1.1";
+  version = "2.2.0";
   providers = {
     airplay = [
     ];
@@ -61,7 +61,10 @@
     ];
     soundcloud = [
     ]; # missing soundcloudpy
-    spotify = [
+    spotify = ps: with ps; [
+      pkce
+    ];
+    template_player_provider = [
     ];
     test = [
     ];