From 3a204ea666b29ba2215f911825299c8997554a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Thu, 13 Jun 2024 04:24:58 +0100
Subject: [PATCH 1/3] feishin: upgrade electron to v30

Addresses #319252: v27 has been EOL since 2024/04/16.

(cherry picked from commit 5e4fd0a2a241359dff7caaeb361f85c097781967)
---
 pkgs/by-name/fe/feishin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index cd97313f2c87d..c506b2e3747b9 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  electron_27,
+  electron_30,
   darwin,
   copyDesktopItems,
   makeDesktopItem,
@@ -20,7 +20,7 @@ let
     hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk=";
   };
 
-  electron = electron_27;
+  electron = electron_30;
 in
 buildNpmPackage {
   inherit pname version;

From 21a75e0916edc7268ac0b7aad178a800304e4ab1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 02:23:37 +0200
Subject: [PATCH 2/3] feishin: change `${pname}` to string literal

(cherry picked from commit 3a831099452985732c8725c6b693bb0f93522294)
---
 pkgs/by-name/fe/feishin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index c506b2e3747b9..d3f9e50deece1 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -15,7 +15,7 @@ let
 
   src = fetchFromGitHub {
     owner = "jeffvli";
-    repo = pname;
+    repo = "feishin";
     rev = "v${version}";
     hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk=";
   };
@@ -123,7 +123,7 @@ buildNpmPackage {
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
         ln -s \
           $out/share/feishin/resources/assets/icons/"$size"x"$size".png \
-          $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
+          $out/share/icons/hicolor/"$size"x"$size"/apps/feishin.png
       done
     ''
     + ''
@@ -135,7 +135,7 @@ buildNpmPackage {
       name = "feishin";
       desktopName = "Feishin";
       comment = "Full-featured Subsonic/Jellyfin compatible desktop music player";
-      icon = pname;
+      icon = "feishin";
       exec = "feishin %u";
       categories = [
         "Audio"

From 5a1c3f5557ddfc7eee8ba5c75f7063c76db6564b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Fri, 23 Aug 2024 00:59:01 +0100
Subject: [PATCH 3/3] feishin: use electron_31

As originally mentioned in #331868, feishin now [1] depends on Electron v31,
which was not packaged at the time (#325428).
It has since been fixed (by #333907).

[1]: https://github.com/jeffvli/feishin/blob/f2beeef/package.json#L234

(cherry picked from commit 3d159512d943d3868b393c2050776c01b828daa6)
---
 pkgs/by-name/fe/feishin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index d3f9e50deece1..b0c1d682f305b 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  electron_30,
+  electron_31,
   darwin,
   copyDesktopItems,
   makeDesktopItem,
@@ -20,7 +20,7 @@ let
     hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk=";
   };
 
-  electron = electron_30;
+  electron = electron_31;
 in
 buildNpmPackage {
   inherit pname version;