From d43df1f6f413dc59e4d2e67fd2291afabc4ff976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:59:39 -0400 Subject: [PATCH 1/4] python311Packages.qpageview: remove references to python3Packages --- pkgs/development/python-modules/qpageview/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 68e7c6a309d2..449ea678d83e 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -2,11 +2,13 @@ lib, fetchFromGitHub, buildPythonPackage, - python3Packages, pythonOlder, + pyqt5, + poppler-qt5, + pycups, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "qpageview"; version = "0.6.2"; format = "setuptools"; @@ -20,7 +22,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ pyqt5 poppler-qt5 pycups From 42918d68f2b88351136c78278c1cd4da45302dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:58:32 -0400 Subject: [PATCH 2/4] python311Packages.pyqtwebengine: use regular callPackage --- .../python-modules/pyqtwebengine/default.nix | 55 ++++++++----------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 263ccf81dfe9..552839b44f2b 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,28 +1,20 @@ { lib, + setuptools, stdenv, - pythonPackages, fetchPypi, pkg-config, - qmake, - qtbase, - qtsvg, - qtwebengine, - qtwebchannel, - qtdeclarative, - wrapQtAppsHook, + libsForQt5, darwin, + buildPythonPackage, + python, + isPy27, + pyqt5, + sip, + pyqt-builder, }: let - inherit (pythonPackages) - buildPythonPackage - python - isPy27 - pyqt5 - sip - pyqt-builder - ; inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage ( @@ -52,32 +44,33 @@ buildPythonPackage ( nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ python.pythonOnBuildForHost.pkgs.sip ] ++ [ - qtbase - qtsvg - qtwebengine + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtwebengine pyqt-builder - pythonPackages.setuptools + setuptools ] - ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ qtdeclarative ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ sip - qtbase - qtsvg - qtwebengine + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtwebengine ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - qtwebchannel - qtdeclarative + libsForQt5.qtwebchannel + libsForQt5.qtdeclarative ]; propagatedBuildInputs = [ pyqt5 ]; @@ -98,21 +91,21 @@ buildPythonPackage ( enableParallelBuilding = true; passthru = { - inherit wrapQtAppsHook; + inherit (libsForQt5) wrapQtAppsHook; }; meta = with lib; { description = "Python bindings for Qt5"; homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; - hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms; + hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms platforms.mesaPlatforms; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # TODO: figure out why the env hooks aren't adding these inclusions automatically env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev qtbase}/include/QtPrintSupport/" - "-I${lib.getDev qtwebchannel}/include/QtWebChannel/" + "-I${lib.getDev libsForQt5.qtbase}/include/QtPrintSupport/" + "-I${lib.getDev libsForQt5.qtwebchannel}/include/QtWebChannel/" ]; } ) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8544f7c7d8f1..8a2c3dbc9d69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12013,9 +12013,7 @@ self: super: with self; { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { - pythonPackages = self; - }; + pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine { }; pyquery = callPackage ../development/python-modules/pyquery { }; From 069af4966210e3497412db76f023542545d3699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 10 Jul 2024 23:03:02 -0400 Subject: [PATCH 3/4] python311Packages.pyqtwebengine: remove use of `meta = with lib;` --- pkgs/development/python-modules/pyqtwebengine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 552839b44f2b..4428779f0b95 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -94,11 +94,11 @@ buildPythonPackage ( inherit (libsForQt5) wrapQtAppsHook; }; - meta = with lib; { + meta = { description = "Python bindings for Qt5"; homepage = "http://www.riverbankcomputing.co.uk"; - license = licenses.gpl3; - hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms platforms.mesaPlatforms; + license = lib.licenses.gpl3; + hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms lib.platforms.mesaPlatforms; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { From 4162e310044d1ed1834360128b748df5af2fbf98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 10 Jul 2024 22:00:20 -0400 Subject: [PATCH 4/4] frescobaldi: pin to python 3.11 to fix build --- pkgs/misc/frescobaldi/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 7f90ceee2915..f37826501d72 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: +{ lib, stdenv, fetchFromGitHub, python311Packages, lilypond }: -buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "frescobaldi"; version = "3.3.0"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ qpageview lilypond pygame @@ -22,7 +22,7 @@ buildPythonApplication rec { pyqtwebengine ]; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ]; # Needed because source is fetched from git preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb1895c6e749..5024b841d05c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7974,7 +7974,7 @@ with pkgs; wxGTK = wxGTK32; }; - frescobaldi = python3Packages.callPackage ../misc/frescobaldi { }; + frescobaldi = callPackage ../misc/frescobaldi { }; freshfetch = callPackage ../tools/misc/freshfetch { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit;