From 0fb2fbc3934318d52d3ae3f0d49efd143eac9388 Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Fri, 11 Aug 2023 18:55:27 -0400
Subject: [PATCH] streamdeck-ui: 2.0.6 -> 3.0.1

---
 .../misc/streamdeck-ui/default.nix            | 31 ++++++-------------
 .../misc/streamdeck-ui/update-pillow.patch    | 13 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/applications/misc/streamdeck-ui/update-pillow.patch

diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix
index ea4ca011e2d9..e43ddf067a78 100644
--- a/pkgs/applications/misc/streamdeck-ui/default.nix
+++ b/pkgs/applications/misc/streamdeck-ui/default.nix
@@ -1,37 +1,27 @@
 { lib
 , python3Packages
 , fetchFromGitHub
-, fetchpatch
 , copyDesktopItems
-, wrapQtAppsHook
 , writeText
 , makeDesktopItem
 , xvfb-run
-, qt5
+, qt6
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "streamdeck-ui";
-  version = "2.0.6";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     repo = "streamdeck-linux-gui";
     owner = "streamdeck-linux-gui";
     rev = "v${version}";
-    sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8=";
+    sha256 = "sha256-nLtWExxufxT5nRiEYLGNeMhFhvlGzYKA+crA74Yt4ck=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "use-poetry-core.patch";
-      url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch";
-      hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays=";
-    })
-    (fetchpatch {
-      name = "update-python-xlib-0.33.patch";
-      url = "https://github.com/timothycrosley/streamdeck-ui/commit/07d7fdd33085b413dd26b02d8a02820edad2d568.patch";
-      hash = "sha256-PylTrbfB8RJ0+kbgJlRdcvfdahGoob8LabwhuFNsUpY=";
-    })
+    # nixpkgs has a newer pillow version
+    ./update-pillow.patch
   ];
 
   desktopItems = [ (makeDesktopItem {
@@ -70,7 +60,7 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [
     python3Packages.poetry-core
     copyDesktopItems
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   propagatedBuildInputs = with python3Packages; [
@@ -79,11 +69,11 @@ python3Packages.buildPythonApplication rec {
     cairosvg
     pillow
     pynput
-    pyside2
+    pyside6
     streamdeck
     xlib
   ] ++ lib.optionals stdenv.isLinux [
-    qt5.qtwayland
+    qt6.qtwayland
   ];
 
   nativeCheckInputs = [
@@ -93,13 +83,10 @@ python3Packages.buildPythonApplication rec {
   ];
 
   # Ignored tests are not in a running or passing state.
-  # Fixes have been merged upstream but not yet released.
   # Revisit these ignored tests on each update.
   checkPhase = ''
     xvfb-run pytest tests \
-      --ignore=tests/test_api.py \
-      --ignore=tests/test_filter.py \
-      --ignore=tests/test_stream_deck_monitor.py
+      --ignore=tests/test_api.py
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/streamdeck-ui/update-pillow.patch b/pkgs/applications/misc/streamdeck-ui/update-pillow.patch
new file mode 100644
index 000000000000..88945586628f
--- /dev/null
+++ b/pkgs/applications/misc/streamdeck-ui/update-pillow.patch
@@ -0,0 +1,13 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 0aff29e..4371616 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -14,7 +14,7 @@ packages = [
+ [tool.poetry.dependencies]
+ python = ">=3.8,<3.12"
+ streamdeck = "^0.9.3"
+-pillow = "^9.4.0"
++pillow = "^10.0.0"
+ pynput = "^1.7.6"
+ pyside6 = "^6.4.2"
+ CairoSVG = "^2.5.2"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6454a14b9c44..cd7933a6fa5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32835,7 +32835,7 @@ with pkgs;
 
   srain = callPackage ../applications/networking/irc/srain { };
 
-  streamdeck-ui = libsForQt5.callPackage ../applications/misc/streamdeck-ui { };
+  streamdeck-ui = callPackage ../applications/misc/streamdeck-ui { };
 
   super-productivity = callPackage ../applications/office/super-productivity { };