streamdeck-ui: 2.0.6 -> 3.0.1

+23 -23
+9 -22
pkgs/applications/misc/streamdeck-ui/default.nix
··· 1 1 { lib 2 2 , python3Packages 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , copyDesktopItems 6 - , wrapQtAppsHook 7 5 , writeText 8 6 , makeDesktopItem 9 7 , xvfb-run 10 - , qt5 8 + , qt6 11 9 }: 12 10 13 11 python3Packages.buildPythonApplication rec { 14 12 pname = "streamdeck-ui"; 15 - version = "2.0.6"; 13 + version = "3.0.1"; 16 14 17 15 src = fetchFromGitHub { 18 16 repo = "streamdeck-linux-gui"; 19 17 owner = "streamdeck-linux-gui"; 20 18 rev = "v${version}"; 21 - sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; 19 + sha256 = "sha256-nLtWExxufxT5nRiEYLGNeMhFhvlGzYKA+crA74Yt4ck="; 22 20 }; 23 21 24 22 patches = [ 25 - (fetchpatch { 26 - name = "use-poetry-core.patch"; 27 - url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; 28 - hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; 29 - }) 30 - (fetchpatch { 31 - name = "update-python-xlib-0.33.patch"; 32 - url = "https://github.com/timothycrosley/streamdeck-ui/commit/07d7fdd33085b413dd26b02d8a02820edad2d568.patch"; 33 - hash = "sha256-PylTrbfB8RJ0+kbgJlRdcvfdahGoob8LabwhuFNsUpY="; 34 - }) 23 + # nixpkgs has a newer pillow version 24 + ./update-pillow.patch 35 25 ]; 36 26 37 27 desktopItems = [ (makeDesktopItem { ··· 70 60 nativeBuildInputs = [ 71 61 python3Packages.poetry-core 72 62 copyDesktopItems 73 - wrapQtAppsHook 63 + qt6.wrapQtAppsHook 74 64 ]; 75 65 76 66 propagatedBuildInputs = with python3Packages; [ ··· 79 69 cairosvg 80 70 pillow 81 71 pynput 82 - pyside2 72 + pyside6 83 73 streamdeck 84 74 xlib 85 75 ] ++ lib.optionals stdenv.isLinux [ 86 - qt5.qtwayland 76 + qt6.qtwayland 87 77 ]; 88 78 89 79 nativeCheckInputs = [ ··· 93 83 ]; 94 84 95 85 # Ignored tests are not in a running or passing state. 96 - # Fixes have been merged upstream but not yet released. 97 86 # Revisit these ignored tests on each update. 98 87 checkPhase = '' 99 88 xvfb-run pytest tests \ 100 - --ignore=tests/test_api.py \ 101 - --ignore=tests/test_filter.py \ 102 - --ignore=tests/test_stream_deck_monitor.py 89 + --ignore=tests/test_api.py 103 90 ''; 104 91 105 92 meta = with lib; {
+13
pkgs/applications/misc/streamdeck-ui/update-pillow.patch
··· 1 + diff --git a/pyproject.toml b/pyproject.toml 2 + index 0aff29e..4371616 100644 3 + --- a/pyproject.toml 4 + +++ b/pyproject.toml 5 + @@ -14,7 +14,7 @@ packages = [ 6 + [tool.poetry.dependencies] 7 + python = ">=3.8,<3.12" 8 + streamdeck = "^0.9.3" 9 + -pillow = "^9.4.0" 10 + +pillow = "^10.0.0" 11 + pynput = "^1.7.6" 12 + pyside6 = "^6.4.2" 13 + CairoSVG = "^2.5.2"
+1 -1
pkgs/top-level/all-packages.nix
··· 32835 32835 32836 32836 srain = callPackage ../applications/networking/irc/srain { }; 32837 32837 32838 - streamdeck-ui = libsForQt5.callPackage ../applications/misc/streamdeck-ui { }; 32838 + streamdeck-ui = callPackage ../applications/misc/streamdeck-ui { }; 32839 32839 32840 32840 super-productivity = callPackage ../applications/office/super-productivity { }; 32841 32841