From 52862e68f8e240a4ef658376777ab49b8bcf4757 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Mon, 27 May 2024 23:02:53 +0200 Subject: [PATCH 1/2] polychromatic: format with nixfmt-rfc-style --- .../misc/polychromatic/default.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 9ed291c79c7e..18619b08d4ee 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,21 +1,22 @@ -{ lib -, fetchFromGitHub -, bash -, glib -, gdk-pixbuf -, gettext -, imagemagick -, ninja -, meson -, sassc -, python3Packages -, gobject-introspection -, wrapGAppsHook3 -, libappindicator-gtk3 -, libxcb -, qt5 -, ibus -, usbutils +{ + lib, + fetchFromGitHub, + bash, + glib, + gdk-pixbuf, + gettext, + imagemagick, + ninja, + meson, + sassc, + python3Packages, + gobject-introspection, + wrapGAppsHook3, + libappindicator-gtk3, + libxcb, + qt5, + ibus, + usbutils, }: python3Packages.buildPythonApplication rec { From 3ef476f22b014dc4efdbec2589f0c523ca26f34b Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Mon, 27 May 2024 23:12:06 +0200 Subject: [PATCH 2/2] polychromatic: 0.8.0 -> 0.9.1 Changelogs: - https://github.com/polychromatic/polychromatic/releases/tag/v0.9.1 - https://github.com/polychromatic/polychromatic/releases/tag/v0.9.0 - https://github.com/polychromatic/polychromatic/releases/tag/v0.8.4 - https://github.com/polychromatic/polychromatic/releases/tag/v0.8.3 - https://github.com/polychromatic/polychromatic/releases/tag/v0.8.2 - https://github.com/polychromatic/polychromatic/releases/tag/v0.8.1 --- .../misc/polychromatic/default.nix | 47 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 18619b08d4ee..2a7386acc624 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -12,23 +12,24 @@ python3Packages, gobject-introspection, wrapGAppsHook3, - libappindicator-gtk3, + libayatana-appindicator, libxcb, - qt5, + qt6, ibus, usbutils, + psmisc, }: python3Packages.buildPythonApplication rec { name = "polychromatic"; - version = "0.8.0"; + version = "0.9.1"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw="; + sha256 = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; }; postPatch = '' @@ -50,23 +51,31 @@ python3Packages.buildPythonApplication rec { ninja sassc wrapGAppsHook3 - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook + qt6.qtbase ]; - propagatedBuildInputs = with python3Packages; [ - colorama - colour - openrazer - pyqt5 - pyqtwebengine - requests - setproctitle - libxcb - openrazer-daemon - libappindicator-gtk3 - ibus - usbutils - ]; + buildInputs = [ qt6.qtwayland ]; + + propagatedBuildInputs = + with python3Packages; + [ + colorama + colour + openrazer + pyqt6 + pyqt6-webengine + requests + setproctitle + libxcb + openrazer-daemon + ibus + usbutils + ] + ++ [ + libayatana-appindicator + psmisc + ]; dontWrapGapps = true; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c99d2166fc88..86d61d0554c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29030,7 +29030,7 @@ with pkgs; poly = callPackage ../data/fonts/poly { }; - polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { }; + polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; polytopes_db = callPackage ../data/misc/polytopes_db { };