From 29deee58097c05c06ffadceb6ca85008d2d266a6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 28 Jun 2024 14:17:03 +0300 Subject: [PATCH] python312Packages.pyqtgraph: unbreak by using pyqt6 The symptom that caused it to be broken with Python 3.12 and PyQt5 was similar to this: https://github.com/moosepy/curvefitgui/issues/2 However we won't put any effort into fixing it, because PyQt5 and PySide2 are close to EOL since Qt5 is close to EOL. --- pkgs/development/python-modules/pyqtgraph/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index 14c4ad1fbc5c..401b1ef4080e 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -5,9 +5,9 @@ fetchFromGitHub, scipy, numpy, - pyqt5, + pyqt6, pyopengl, - qt5, + qt6, pytestCheckHook, freefont_ttf, makeFontsConf, @@ -41,13 +41,13 @@ buildPythonPackage rec { # Not propagating it so that every consumer of this package will be able to # use any of the upstream supported Qt Library, See: # https://pyqtgraph.readthedocs.io/en/pyqtgraph-0.13.7/getting_started/how_to_use.html#pyqt-and-pyside - pyqt5 + pyqt6 ]; nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' - export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks export FONTCONFIG_FILE=${fontsConf} @@ -75,7 +75,6 @@ buildPythonPackage rec { homepage = "https://www.pyqtgraph.org/"; changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG"; license = licenses.mit; - broken = lib.versionAtLeast python.version "3.12"; platforms = platforms.unix; maintainers = with maintainers; [ koral ]; };