From 04072e358206d63334349475e50fcc9dd64d9ac2 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 18 Nov 2024 13:03:43 -0700
Subject: [PATCH 1/2] onthespot: add ryand56 as maintainer

---
 pkgs/by-name/on/onthespot/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix
index 86bd42383db62..4ab6d14f59c03 100644
--- a/pkgs/by-name/on/onthespot/package.nix
+++ b/pkgs/by-name/on/onthespot/package.nix
@@ -79,7 +79,10 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/casualsnek/onthespot";
     changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ onny ];
+    maintainers = with lib.maintainers; [
+      onny
+      ryand56
+    ];
     platforms = lib.platforms.linux;
     mainProgram = "onthespot_gui";
   };

From 88a215d87c65c54a629680b8909e629ad97e449f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 4 Jan 2025 01:44:53 -0700
Subject: [PATCH 2/2] onthespot: 0.5 -> 1.0.4

---
 pkgs/by-name/on/onthespot/package.nix | 37 +++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix
index 4ab6d14f59c03..308f6ee7b65f1 100644
--- a/pkgs/by-name/on/onthespot/package.nix
+++ b/pkgs/by-name/on/onthespot/package.nix
@@ -4,22 +4,26 @@
   fetchFromGitHub,
   makeDesktopItem,
   python3,
-  libsForQt5,
+  kdePackages,
   ffmpeg,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "onthespot";
-  version = "0.5";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "casualsnek";
+    owner = "justin025";
     repo = "onthespot";
     tag = "v${version}";
-    hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg=";
+    hash = "sha256-W/7xfdSCrKrvG5M5IMPQyifjgE4H7t98YS4230HQd9c=";
   };
 
+  build-system = [ python3.pkgs.setuptools ];
+
+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
   pythonRemoveDeps = [
     "PyQt5-Qt5"
     "PyQt5-stubs"
@@ -30,9 +34,9 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
     copyDesktopItems
-    libsForQt5.wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   dependencies = with python3.pkgs; [
@@ -40,27 +44,26 @@ python3.pkgs.buildPythonApplication rec {
     charset-normalizer
     defusedxml
     ffmpeg
+    flask
     librespot
     music-tag
     packaging
     pillow
     protobuf
-    pyqt5
-    pyqt5-sip
+    pyperclip
+    pyqt6
+    pyqt6-sip
     pyxdg
+    qt6.qtbase
     requests
-    setuptools
     show-in-file-manager
     urllib3
+    yt-dlp
     zeroconf
   ];
 
   postInstall = ''
-    install -Dm444 $src/src/onthespot/resources/icon.png $out/share/icons/hicolor/256x256/apps/onthespot.png
-  '';
-
-  preFixup = ''
-    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    install -Dm444 $src/src/onthespot/resources/icons/onthespot.png $out/share/icons/hicolor/256x256/apps/onthespot.png
   '';
 
   desktopItems = [
@@ -70,14 +73,14 @@ python3.pkgs.buildPythonApplication rec {
       icon = "onthespot";
       desktopName = "Onthespot";
       comment = meta.description;
-      categories = [ "Audio" ];
+      categories = [ "AudioVideo" ];
     })
   ];
 
   meta = {
     description = "QT based Spotify music downloader written in Python";
-    homepage = "https://github.com/casualsnek/onthespot";
-    changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}";
+    homepage = "https://github.com/justin025/onthespot";
+    changelog = "https://github.com/justin025/onthespot/releases/tag/v${version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       onny