From 1840314347a59db1f05cbd0178d5136279a9621e Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 23 Mar 2026 18:22:25 +0300 Subject: [PATCH 1/2] qt6: 6.10.2 -> 6.11 If anyone wants to package the new modules, be my guest. --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../qtdeclarative/another-crash-fix.patch | 16 - .../qt-6/modules/qtdeclarative/default.nix | 11 +- .../libraries/qt-6/modules/qtmqtt.nix | 4 +- .../qt-6/modules/qttools/default.nix | 4 - .../qt-6/modules/qttools/paths.patch | 25 -- pkgs/development/libraries/qt-6/srcs.nix | 336 ++++++++++-------- 7 files changed, 190 insertions(+), 208 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch delete mode 100644 pkgs/development/libraries/qt-6/modules/qttools/paths.patch diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 7e4781e5114e..73d170689480 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.11/6.11.0/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch deleted file mode 100644 index e63a70c53708..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/qml/jsruntime/qv4qobjectwrapper.cpp -+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp -@@ -1583,10 +1583,9 @@ - o->deleteLater(); - } else { - // If the object is C++-owned, we still have to release the weak reference we have -- // to it. -- ddata->jsWrapper.clear(); -- if (lastCall && ddata->propertyCache) -- ddata->propertyCache.reset(); -+ // to it. If the "main" wrapper is not ours, we should leave it alone, though. -+ if (ddata->jsWrapper.as() == this) -+ ddata->jsWrapper.clear(); - } - } - } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index 972a8f372170..786229c5651b 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -10,6 +10,7 @@ lib, pkgsBuildBuild, replaceVars, + fetchpatch, }: qtModule { @@ -36,10 +37,12 @@ qtModule { # add version specific QML import path ./use-versioned-import-path.patch - # Backport of https://codereview.qt-project.org/c/qt/qtdeclarative/+/704031 - # Fixes common Plasma crash - # FIXME: remove in 6.10.3 - ./another-crash-fix.patch + # revert codesigning change on Darwin that doesn't work with our signing tools + (fetchpatch { + url = "https://github.com/qt/qtdeclarative/commit/a7084abd9778b955d80e7419e82f6f7b92f7978d.diff"; + hash = "sha256-ESy35OlmsvI4yFQ/rFT8oelOUBCwCmlcbQJvwcTrCig="; + revert = true; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index ea00d966e8a3..effea1d03ab4 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -6,13 +6,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.10.2"; + version = "6.11.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; tag = "v${version}"; - hash = "sha256-NjYvL6BCn0UP7F2CW81upzZ8EwFAkhoUa5cdaH0uhM4="; + hash = "sha256-7X+HWAftWHn40RPFQD3/f+bp00LQk8Vsb871WfxdZSE="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix index 58ef182fff2c..c81cb2ac55fa 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix @@ -14,10 +14,6 @@ qtModule { pname = "qttools"; - patches = [ - ./paths.patch - ]; - postPatch = '' substituteInPlace \ src/qdoc/catch/CMakeLists.txt \ diff --git a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch deleted file mode 100644 index 6b1eca682c59..000000000000 --- a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/linguist/shared/runqttool.cpp -+++ b/src/linguist/shared/runqttool.cpp -@@ -20,9 +20,21 @@ class FMT { - Q_DECLARE_TR_FUNCTIONS(Linguist) - }; - -+static QString qtBasePath(QLibraryInfo::LibraryPath location) -+{ -+ switch (location) { -+ case QLibraryInfo::BinariesPath: -+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin"); -+ case QLibraryInfo::LibraryExecutablesPath: -+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec"); -+ default: -+ return QLibraryInfo::path(location); -+ } -+} -+ - static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location) - { -- QString filePath = QLibraryInfo::path(location) + u'/' + toolName; -+ QString filePath = qtBasePath(location) + u'/' + toolName; - #ifdef Q_OS_WIN - filePath.append(QLatin1String(".exe")); - #endif diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 585e16fb0148..73067dc5fd5c 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,339 @@ { qt3d = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt3d-everywhere-src-6.10.2.tar.xz"; - sha256 = "0vdvid42m9jyhmpclfgpc7j1ivxlj0jr23kp5pxa1v0z96fwmfzy"; - name = "qt3d-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qt3d-everywhere-src-6.11.0.tar.xz"; + sha256 = "086xpissihbil51ryl83dlcpkpv3pp3ryj0712x9k9z6756j7ks0"; + name = "qt3d-everywhere-src-6.11.0.tar.xz"; }; }; qt5compat = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt5compat-everywhere-src-6.10.2.tar.xz"; - sha256 = "1hk18428bpp60ypjzabzpc77nr10bzignqppqppvjbn0zbq1i91z"; - name = "qt5compat-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qt5compat-everywhere-src-6.11.0.tar.xz"; + sha256 = "0gn6sj136y8yl1c00nbm81rmhws0mgx35ny7llx74j97ddj58ag6"; + name = "qt5compat-everywhere-src-6.11.0.tar.xz"; }; }; qtactiveqt = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtactiveqt-everywhere-src-6.10.2.tar.xz"; - sha256 = "09swk8xv93gmk67v6zccxr3hjy4404q0awljfjlapas9xi10bnym"; - name = "qtactiveqt-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtactiveqt-everywhere-src-6.11.0.tar.xz"; + sha256 = "1kbqa0gx41s097281g4zym9jmjs2ffc75p3rgkbs6bvnlrvl0h89"; + name = "qtactiveqt-everywhere-src-6.11.0.tar.xz"; }; }; qtbase = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtbase-everywhere-src-6.10.2.tar.xz"; - sha256 = "07pjmnwmlsbxc9zxgcazq9w4jnq6ypw50ndm7kamyaqs54lqvdxf"; - name = "qtbase-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtbase-everywhere-src-6.11.0.tar.xz"; + sha256 = "0pkmrd8ypw1v21cx0890gc6z4v0xr5qip2jnr56r2kc6g5cxh6i3"; + name = "qtbase-everywhere-src-6.11.0.tar.xz"; + }; + }; + qtcanvaspainter = { + version = "6.11.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtcanvaspainter-everywhere-src-6.11.0.tar.xz"; + sha256 = "1gmgzmh81wrnj81xsmilqwhc1wv7j2avg91mww8jlrv5rplzynjl"; + name = "qtcanvaspainter-everywhere-src-6.11.0.tar.xz"; }; }; qtcharts = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtcharts-everywhere-src-6.10.2.tar.xz"; - sha256 = "001ckwq5w5w164cz2hkkb2dvci1d77mm9hf4hha9ivgdqns1cla0"; - name = "qtcharts-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtcharts-everywhere-src-6.11.0.tar.xz"; + sha256 = "1dcldlw24qd9swynxcdsxnk8haiv442wx323j7qgfwjp13a9nh5c"; + name = "qtcharts-everywhere-src-6.11.0.tar.xz"; }; }; qtconnectivity = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtconnectivity-everywhere-src-6.10.2.tar.xz"; - sha256 = "0chs66537ki0yvq94m2i3k69wf8kyr741m4wg6vbamr8ychz0n6g"; - name = "qtconnectivity-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtconnectivity-everywhere-src-6.11.0.tar.xz"; + sha256 = "0fhrqqz58h3smkksfgnax73bmsiz7q9a1w9vhwd83vs9r0jc3w60"; + name = "qtconnectivity-everywhere-src-6.11.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdatavis3d-everywhere-src-6.10.2.tar.xz"; - sha256 = "1hav6ncccdhw2kyx608xhchpmygx6sbfap8x6ch35l53yj5l0sdp"; - name = "qtdatavis3d-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdatavis3d-everywhere-src-6.11.0.tar.xz"; + sha256 = "1jr3bkvp4wj1jdafc64ziq4raxbya6jk6s0d4mq0w2kr7zpqrggf"; + name = "qtdatavis3d-everywhere-src-6.11.0.tar.xz"; }; }; qtdeclarative = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdeclarative-everywhere-src-6.10.2.tar.xz"; - sha256 = "03sb1wfxqvy5dhyd85yc0776vvm2jzczlpwbvzqdpp3cyr7r2jd2"; - name = "qtdeclarative-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdeclarative-everywhere-src-6.11.0.tar.xz"; + sha256 = "1sgxxmg49flana7mylyz4c5mf5hr00kzl8nkwwj87pqx8dlybv2f"; + name = "qtdeclarative-everywhere-src-6.11.0.tar.xz"; }; }; qtdoc = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdoc-everywhere-src-6.10.2.tar.xz"; - sha256 = "011pp0nf019dg790vhr9i3xiy6vspzjpr8w8xd9cpyk723nsj54c"; - name = "qtdoc-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdoc-everywhere-src-6.11.0.tar.xz"; + sha256 = "1wwl2vr1qs2lqmz45iqpkzkxqp97g0yzfmz0kb5wpi8sys7c07bx"; + name = "qtdoc-everywhere-src-6.11.0.tar.xz"; }; }; qtgraphs = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgraphs-everywhere-src-6.10.2.tar.xz"; - sha256 = "1bvsvmwf4csl63fqf4gdqb03s97b9dl0sdyffrp9mn37lmmgr47n"; - name = "qtgraphs-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtgraphs-everywhere-src-6.11.0.tar.xz"; + sha256 = "0nxifvs5042pzyd5syhgpmxzsq07fhpbbm57ckwzsn55q14cnvyz"; + name = "qtgraphs-everywhere-src-6.11.0.tar.xz"; }; }; qtgrpc = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgrpc-everywhere-src-6.10.2.tar.xz"; - sha256 = "0dnibqlsnra4kwk1dng4g6rrndszx5kz1p12zzjj0y8cq74vz1kk"; - name = "qtgrpc-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtgrpc-everywhere-src-6.11.0.tar.xz"; + sha256 = "0yd8jjxigaynv386f3cs1i743nm7yngciw346xqfil3chd8wpvcx"; + name = "qtgrpc-everywhere-src-6.11.0.tar.xz"; }; }; qthttpserver = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qthttpserver-everywhere-src-6.10.2.tar.xz"; - sha256 = "0hs6zq1qfs4yfr9bf2d089q37wcyhgvx48vq54szsn72prcqsmi6"; - name = "qthttpserver-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qthttpserver-everywhere-src-6.11.0.tar.xz"; + sha256 = "16wqglm8ws63qs7i769xy94bygwbhkz7hjfw27hnps7d4yirb41b"; + name = "qthttpserver-everywhere-src-6.11.0.tar.xz"; }; }; qtimageformats = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtimageformats-everywhere-src-6.10.2.tar.xz"; - sha256 = "0rwxcdpzx5mls7sqvscq58hb2h01j4qpy3h07ixiw21qhrqrr3wb"; - name = "qtimageformats-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtimageformats-everywhere-src-6.11.0.tar.xz"; + sha256 = "1j0cjj7gxjbprszw349janl3zk38rkby1bmxil329zp2qlmb1bfk"; + name = "qtimageformats-everywhere-src-6.11.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlanguageserver-everywhere-src-6.10.2.tar.xz"; - sha256 = "0lqdqknblw4nsv1mgi5jw6rqsf7h9zf59af7bw371d5hhhn3y14s"; - name = "qtlanguageserver-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlanguageserver-everywhere-src-6.11.0.tar.xz"; + sha256 = "1gq5yjvk6iyg606pgpxkb136qlz9hpb7ngll81nhiyb1ym1y9j0v"; + name = "qtlanguageserver-everywhere-src-6.11.0.tar.xz"; }; }; qtlocation = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlocation-everywhere-src-6.10.2.tar.xz"; - sha256 = "0g0gwldmdslzx0zjdpi3vc0pqnd266qkxynh8xy534y5xmfz04yk"; - name = "qtlocation-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlocation-everywhere-src-6.11.0.tar.xz"; + sha256 = "1vxb6n8xf98zcg2bw29gsaqa74sg6jn9ilzs8c5b9q79i9m3if49"; + name = "qtlocation-everywhere-src-6.11.0.tar.xz"; }; }; qtlottie = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlottie-everywhere-src-6.10.2.tar.xz"; - sha256 = "1302lh7432372qy0mw2pv67miikf2ny2n103s8mhyfl30xx6pn55"; - name = "qtlottie-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlottie-everywhere-src-6.11.0.tar.xz"; + sha256 = "02ndplkk4bq01b0fh9l2ykw09v0k5nbsayrs9wcjwrdwg5law8rg"; + name = "qtlottie-everywhere-src-6.11.0.tar.xz"; }; }; qtmultimedia = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtmultimedia-everywhere-src-6.10.2.tar.xz"; - sha256 = "0aryhch6qlamgfcbrxc0d1ggq4f96vjg68r7b8b33mzv0q0yzxwk"; - name = "qtmultimedia-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtmultimedia-everywhere-src-6.11.0.tar.xz"; + sha256 = "0h30l8zflkla7rcshgs0jfjbjwvq9rqx0wq83f6vd0x9lz0cmi4h"; + name = "qtmultimedia-everywhere-src-6.11.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtnetworkauth-everywhere-src-6.10.2.tar.xz"; - sha256 = "1cw1355xxf0ca96xwjaw33nnrxh1qw26naa2zha5fpsh9fggsaag"; - name = "qtnetworkauth-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtnetworkauth-everywhere-src-6.11.0.tar.xz"; + sha256 = "1mqly8had79f54dlygh42jr0c0jfiv4j4w2rbr0s7qx9nk9ig342"; + name = "qtnetworkauth-everywhere-src-6.11.0.tar.xz"; + }; + }; + qtopenapi = { + version = "6.11.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtopenapi-everywhere-src-6.11.0.tar.xz"; + sha256 = "1h2pcq6i72yic0r7ns36vj678d1xqy291jamqd6b6jkjddmj1hlg"; + name = "qtopenapi-everywhere-src-6.11.0.tar.xz"; }; }; qtpositioning = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtpositioning-everywhere-src-6.10.2.tar.xz"; - sha256 = "1kndqjh3ylbs5a2chqv3a6jip83j6zy9dlya82c7crkw8xjgllbh"; - name = "qtpositioning-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtpositioning-everywhere-src-6.11.0.tar.xz"; + sha256 = "1scnnz65qyfg0nl9vjkqcss8xsw3yf91w71d9p1kwlfybscd07yn"; + name = "qtpositioning-everywhere-src-6.11.0.tar.xz"; }; }; qtquick3d = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3d-everywhere-src-6.10.2.tar.xz"; - sha256 = "0xfdlafzz7k3vps0kzz4mnyv0cmr0f5v8a4qkqvhqn0y3prkjm5r"; - name = "qtquick3d-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquick3d-everywhere-src-6.11.0.tar.xz"; + sha256 = "1549gdb3yxj1bpl54kgnkkhzjx0zxqi71ssp4rj6qnz56fxh085l"; + name = "qtquick3d-everywhere-src-6.11.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3dphysics-everywhere-src-6.10.2.tar.xz"; - sha256 = "1nqw5kqrivmajbw2sqxll8zgqjk79g2pic8rghfkb52ps1xzdbxp"; - name = "qtquick3dphysics-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquick3dphysics-everywhere-src-6.11.0.tar.xz"; + sha256 = "0dcx9913xss435cijx5bzckvsn66qfi6c39rx0gyv9iiys76qym5"; + name = "qtquick3dphysics-everywhere-src-6.11.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquickeffectmaker-everywhere-src-6.10.2.tar.xz"; - sha256 = "1i62d7s6fl4lf92cfwljk7blirz82mv174k1d5nrw38c9qxz3jp3"; - name = "qtquickeffectmaker-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquickeffectmaker-everywhere-src-6.11.0.tar.xz"; + sha256 = "05fpv497rmx2lw7gx05sxyxjwx8gq8fbbnkzhnw73pk2xqzq20mc"; + name = "qtquickeffectmaker-everywhere-src-6.11.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquicktimeline-everywhere-src-6.10.2.tar.xz"; - sha256 = "0933sggxp28mybdr8wgfyny9m0c23h70f3fy1mwxy7yjb2vxhckh"; - name = "qtquicktimeline-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquicktimeline-everywhere-src-6.11.0.tar.xz"; + sha256 = "1micycw7m25gw0bgbfq7bnr7cg7qrjj2r69320rglc8lak6f3nq6"; + name = "qtquicktimeline-everywhere-src-6.11.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtremoteobjects-everywhere-src-6.10.2.tar.xz"; - sha256 = "1kb5xd1ckp4phq820rl9h6nbaryrybzk2zxlq83cykg79w23ys5w"; - name = "qtremoteobjects-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtremoteobjects-everywhere-src-6.11.0.tar.xz"; + sha256 = "15yykbaxqc6v2flgjvn92w7gwfvi820dg4cxkjxcfhpix2m21571"; + name = "qtremoteobjects-everywhere-src-6.11.0.tar.xz"; }; }; qtscxml = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtscxml-everywhere-src-6.10.2.tar.xz"; - sha256 = "0si3vpzva8wyqa0gh0fyk75knlgmsyjalahp41nv1cginf6ig70g"; - name = "qtscxml-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtscxml-everywhere-src-6.11.0.tar.xz"; + sha256 = "1rylchpvzldy7hhr3icr85w8m4hf7wch17yqh368yrn3q19klf3c"; + name = "qtscxml-everywhere-src-6.11.0.tar.xz"; }; }; qtsensors = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsensors-everywhere-src-6.10.2.tar.xz"; - sha256 = "10gmis63gpqhbb7ljy1gx3gh7hww6psk66c6jqvaxgzbgidm3rli"; - name = "qtsensors-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtsensors-everywhere-src-6.11.0.tar.xz"; + sha256 = "1iy33w7gjp06xi4342si979q9w84cvbbk90kxmk2gx69icjjja21"; + name = "qtsensors-everywhere-src-6.11.0.tar.xz"; }; }; qtserialbus = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialbus-everywhere-src-6.10.2.tar.xz"; - sha256 = "0yrsg50gmjlxnp1574fzkfbxls1cmjkn1qpagayhx55nrzzbydj7"; - name = "qtserialbus-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtserialbus-everywhere-src-6.11.0.tar.xz"; + sha256 = "1qfs9zqvz3hf16w8gg6nlwxcv6sz72546pds02dabhkcw47nqvmh"; + name = "qtserialbus-everywhere-src-6.11.0.tar.xz"; }; }; qtserialport = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialport-everywhere-src-6.10.2.tar.xz"; - sha256 = "0sxxvrn1bwrzm140988prn12f14pj15v8z3yxs7zl7qiv8lvy35l"; - name = "qtserialport-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtserialport-everywhere-src-6.11.0.tar.xz"; + sha256 = "111pmva70mcffhq09q2h1gcr03fivs9j2ywx4ib00pbyxfvr4ii6"; + name = "qtserialport-everywhere-src-6.11.0.tar.xz"; }; }; qtshadertools = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtshadertools-everywhere-src-6.10.2.tar.xz"; - sha256 = "1j8ncwhjcy2k6p05cldnb20vbqijq1frdac9xpk9cvky9yydpn8q"; - name = "qtshadertools-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtshadertools-everywhere-src-6.11.0.tar.xz"; + sha256 = "0jp1sb9pl7y821awln7rpk0hz7d5ipwnkqhy51caich9i2pb2g74"; + name = "qtshadertools-everywhere-src-6.11.0.tar.xz"; }; }; qtspeech = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtspeech-everywhere-src-6.10.2.tar.xz"; - sha256 = "051h4v0qqjkz1brkypx6i2wzdpn8pwz5353f0f7hsavr2p3zcdyr"; - name = "qtspeech-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtspeech-everywhere-src-6.11.0.tar.xz"; + sha256 = "08fv8v6rvcv0pa6r52kr2na2rcpjr3yk556ksinnh6aslv8qbid9"; + name = "qtspeech-everywhere-src-6.11.0.tar.xz"; }; }; qtsvg = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsvg-everywhere-src-6.10.2.tar.xz"; - sha256 = "1qfnv8ssflndjhv6r8s9vxfl8yblra956d00f8c3bwna707zhzzh"; - name = "qtsvg-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtsvg-everywhere-src-6.11.0.tar.xz"; + sha256 = "1rih59jsn0wq12gq5gbs1cz9by27x2x4wjpd0ya7s207pr9xda6z"; + name = "qtsvg-everywhere-src-6.11.0.tar.xz"; + }; + }; + qttasktree = { + version = "6.11.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttasktree-everywhere-src-6.11.0.tar.xz"; + sha256 = "0kxkm3qvzw5i5x2ads6skpz8z6shbn2msznmr614yvsdgiga4yjr"; + name = "qttasktree-everywhere-src-6.11.0.tar.xz"; }; }; qttools = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttools-everywhere-src-6.10.2.tar.xz"; - sha256 = "092vimkdpad6q9dilkhc45wmzzzs5ykfmbkfbi1d4xpxq43jqg8y"; - name = "qttools-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttools-everywhere-src-6.11.0.tar.xz"; + sha256 = "0xpwv483zrw3jkajhv9sbr7bm95qahxg770vn1jqk10hg8yrkcfg"; + name = "qttools-everywhere-src-6.11.0.tar.xz"; }; }; qttranslations = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttranslations-everywhere-src-6.10.2.tar.xz"; - sha256 = "0i56a03b7f6snvxfjsa5q4mnw6x7kxjnx2yw2rbm8sypr4xq3cxk"; - name = "qttranslations-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttranslations-everywhere-src-6.11.0.tar.xz"; + sha256 = "0mpy3y76n1jw2prhad9rqyn48miqlmqg3581jgzr4s1iwhpqpx2l"; + name = "qttranslations-everywhere-src-6.11.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz"; - sha256 = "0swqvcgp6p80k2g7nzb6dcjr2spxcj4lk48s7ll3ygx8j5h2awv2"; - name = "qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtvirtualkeyboard-everywhere-src-6.11.0.tar.xz"; + sha256 = "11p6m1s7r7q2y6a2ak5lyzfd2907s2skfa630snf64x32cblp2nq"; + name = "qtvirtualkeyboard-everywhere-src-6.11.0.tar.xz"; }; }; qtwayland = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwayland-everywhere-src-6.10.2.tar.xz"; - sha256 = "1qkyabklzzzbh4ryxhbnvnpz52vzqvyqwzd6lqkdy6978gmrh69r"; - name = "qtwayland-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwayland-everywhere-src-6.11.0.tar.xz"; + sha256 = "0dsdv1d4p1wf0sqd26cmj486bvwlprmqzmjddsw24agrc3kyc477"; + name = "qtwayland-everywhere-src-6.11.0.tar.xz"; }; }; qtwebchannel = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebchannel-everywhere-src-6.10.2.tar.xz"; - sha256 = "09rc9y51bdb46pj7wad59gycy2l4ki3siizxai6kgq0risgsa7p3"; - name = "qtwebchannel-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebchannel-everywhere-src-6.11.0.tar.xz"; + sha256 = "097vm6pxh18bil9ld9cxg50v861nyhaha4f6bjfjqph1icx18ip9"; + name = "qtwebchannel-everywhere-src-6.11.0.tar.xz"; }; }; qtwebengine = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebengine-everywhere-src-6.10.2.tar.xz"; - sha256 = "07ln4f89qlxvsxg5gjwvwqhcfkhvf5kympk7hmhqi6m6jbrdsvl5"; - name = "qtwebengine-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebengine-everywhere-src-6.11.0.tar.xz"; + sha256 = "0dk72k92zp19jkph1vl88l2dyrh105v6cycsxln1anfxnb423fb3"; + name = "qtwebengine-everywhere-src-6.11.0.tar.xz"; }; }; qtwebsockets = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebsockets-everywhere-src-6.10.2.tar.xz"; - sha256 = "1g9fnj73q3s8a49qzhr1iv2h7z50hwwnja80s9bgd7jhx8dpbk7c"; - name = "qtwebsockets-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebsockets-everywhere-src-6.11.0.tar.xz"; + sha256 = "0cnh67ncfh0gvpqfiqhr0cpmswq9zysza130axlmh69mzg8i17sn"; + name = "qtwebsockets-everywhere-src-6.11.0.tar.xz"; }; }; qtwebview = { - version = "6.10.2"; + version = "6.11.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebview-everywhere-src-6.10.2.tar.xz"; - sha256 = "1d7as06xmbmjx1rfnhrvizhy85dz3xdlx3pzy370r44q17zhdi3y"; - name = "qtwebview-everywhere-src-6.10.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebview-everywhere-src-6.11.0.tar.xz"; + sha256 = "1cy4x331h0f4d5l8c18xrvdq6hwz7r16qd1xhr8gdm8j9bcsw3nb"; + name = "qtwebview-everywhere-src-6.11.0.tar.xz"; }; }; } From 0698f1c1e614d519aa5f8949de9c9b4b9f77e49c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 23 Mar 2026 18:23:07 +0300 Subject: [PATCH 2/2] python3Packages.pyside6: 6.10 -> 6.11 Now even more split! --- .../python-modules/pyside6/default.nix | 13 ++-- .../python-modules/pyside6/fix-paths.patch | 13 ++++ .../shiboken6-generator/default.nix | 70 +++++++++++++++++++ .../fix-include-qt-headers.patch | 21 +++--- .../python-modules/shiboken6/default.nix | 37 ++++------ pkgs/top-level/python-packages.nix | 4 ++ 6 files changed, 117 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/python-modules/pyside6/fix-paths.patch create mode 100644 pkgs/development/python-modules/shiboken6-generator/default.nix rename pkgs/development/python-modules/{shiboken6 => shiboken6-generator}/fix-include-qt-headers.patch (88%) diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 0a9621aaa2d2..f8165e7e8bc0 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -60,13 +60,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sources/pyside6"; patches = [ - # revert commit that breaks generated cmake files - (fetchpatch { - url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=05e328476f2d6ef8a0f3f44aca1e5b1cdb7499fc"; - revert = true; - stripLen = 2; - hash = "sha256-PPLV5K+xp7ZdG0Tah1wpBdNWN7fsXvZh14eBzO0R55c="; - }) + ./fix-paths.patch ]; # Qt Designer plugin moved to a separate output to reduce closure size @@ -120,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ shiboken6 ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + "-Dis_pyside6_superproject_build=1" + ]; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/pyside6/fix-paths.patch b/pkgs/development/python-modules/pyside6/fix-paths.patch new file mode 100644 index 000000000000..f064dbc046b5 --- /dev/null +++ b/pkgs/development/python-modules/pyside6/fix-paths.patch @@ -0,0 +1,13 @@ +--- a/libpyside/CMakeLists.txt ++++ b/libpyside/CMakeLists.txt +@@ -162,8 +162,8 @@ configure_package_config_file( + + # Install-tree / wheel configuration + set(PYSIDE_PYTHONPATH "") +-set(PYSIDE_TYPESYSTEMS "typesystems") +-set(PYSIDE_GLUE "glue") ++set(PYSIDE_TYPESYSTEMS "share/PySide6${pyside6_SUFFIX}/typesystems") ++set(PYSIDE_GLUE "share/PySide6${pyside6_SUFFIX}/glue") + set(PYSIDE_SOVERSION "${pyside6_library_so_version}") + + configure_package_config_file( diff --git a/pkgs/development/python-modules/shiboken6-generator/default.nix b/pkgs/development/python-modules/shiboken6-generator/default.nix new file mode 100644 index 000000000000..680a952cdcfa --- /dev/null +++ b/pkgs/development/python-modules/shiboken6-generator/default.nix @@ -0,0 +1,70 @@ +{ + lib, + fetchgit, + llvmPackages, + python, + cmake, + stdenv, +}: + +let + stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; +in +stdenv'.mkDerivation (finalAttrs: { + pname = "shiboken6-generator"; + version = "6.11.0"; + + src = fetchgit { + url = "https://code.qt.io/pyside/pyside-setup.git"; + tag = "v${finalAttrs.version}"; + hash = "sha256-UbvH+wNiXjfMhaRUODx3p2cJmAz/dJ5kjPSprGKwsYg="; + }; + + patches = [ + ./fix-include-qt-headers.patch + ]; + + sourceRoot = "${finalAttrs.src.name}/sources/shiboken6_generator"; + + nativeBuildInputs = [ + cmake + python.pkgs.ninja + (python.withPackages (ps: [ + ps.packaging + ps.setuptools + ])) + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + python.pkgs.qt6.qtbase + ]; + + cmakeFlags = [ + "-Dis_pyside6_superproject_build=1" + ]; + + dontWrapQtApps = true; + + postInstall = '' + cd ../../.. + chmod +w . + python3 setup.py egg_info --build-type=shiboken6-generator + cp -r shiboken6_generator.egg-info $out/${python.sitePackages}/ + ''; + + meta = { + description = "Generator for the pyside6 Qt bindings - tools"; + license = with lib.licenses; [ + lgpl3Only + gpl2Only + gpl3Only + ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; + maintainers = [ ]; + platforms = lib.platforms.all; + mainProgram = "shiboken6"; + }; +}) diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch similarity index 88% rename from pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch rename to pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch index c9b2d51a94df..d8693a0701f6 100644 --- a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch +++ b/pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch @@ -8,7 +8,7 @@ #include -@@ -638,6 +639,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) +@@ -391,6 +392,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) { QByteArrayList result; HeaderPaths headerPaths; @@ -19,16 +19,17 @@ + // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include + QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s); + - switch (compiler()) { + switch (_optionsTriplet.compiler()) { case Compiler::Msvc: result.append("-fms-compatibility-version="_ba + msvcCompatVersion()); -@@ -651,10 +659,27 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) +@@ -403,9 +411,25 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) + if (needsClangBuiltinIncludes()) appendClangBuiltinIncludes(&headerPaths); break; - case Compiler::Clang: +- case Compiler::Clang: - headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s), - _compilerArguments)); -+ { ++ case Compiler::Clang: { + // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. + // PySide requires that Qt headers are not -isystem + // https://bugreports.qt.io/browse/PYSIDE-787 @@ -46,13 +47,11 @@ + headerPaths.append({h.path, HeaderType::Standard}); + } + } - result.append(noStandardIncludeOption()); - break; + } - case Compiler::Gpp: + break; + case Compiler::Gpp: { if (needsClangBuiltinIncludes()) - appendClangBuiltinIncludes(&headerPaths); -@@ -664,8 +689,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) +@@ -416,8 +440,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level) const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_s), _compilerArguments); for (const HeaderPath &h : gppPaths) { @@ -72,5 +71,5 @@ + headerPaths.append({h.path, HeaderType::Standard}); + } } - break; } + break; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index c8c58bc2503d..e4f85d57adb9 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -1,11 +1,10 @@ { lib, - fetchgit, llvmPackages, python, + shiboken6-generator, numpy, cmake, - autoPatchelfHook, stdenv, }: @@ -14,32 +13,26 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.10.0"; - src = fetchgit { - url = "https://code.qt.io/pyside/pyside-setup.git"; - tag = "v${finalAttrs.version}"; - hash = "sha256-zJV4rrqr2bzWFEG1CWOI+y6wbfQDvWAst6T3aSssj6M="; - }; + inherit (shiboken6-generator) version src; sourceRoot = "${finalAttrs.src.name}/sources/shiboken6"; - patches = [ ./fix-include-qt-headers.patch ]; - nativeBuildInputs = [ cmake - (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ])) - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + python.pkgs.ninja + (python.pythonOnBuildForHost.withPackages (ps: [ + ps.packaging + ps.setuptools + ])) + ]; + + propagatedNativeBuildInputs = [ + shiboken6-generator + ]; buildInputs = [ - llvmPackages.llvm - llvmPackages.libclang python.pkgs.qt6.qtbase - python.pkgs.ninja - python.pkgs.packaging - python.pkgs.setuptools - numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ python.pkgs.qt6.darwinVersionInputs @@ -48,6 +41,7 @@ stdenv'.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DNUMPY_INCLUDE_DIR=${numpy.coreIncludeDir}" + "-Dis_pyside6_superproject_build=1" ]; # We intentionally use single quotes around `${BASH}` since it expands from a CMake @@ -65,14 +59,14 @@ stdenv'.mkDerivation (finalAttrs: { postInstall = '' cd ../../.. chmod +w . - ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6 + python3 setup.py egg_info --build-type=shiboken6 cp -r shiboken6.egg-info $out/${python.sitePackages}/ ''; dontWrapQtApps = true; meta = { - description = "Generator for the pyside6 Qt bindings"; + description = "Generator for the pyside6 Qt bindings - Python library"; license = with lib.licenses; [ lgpl3Only gpl2Only @@ -82,6 +76,5 @@ stdenv'.mkDerivation (finalAttrs: { changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; maintainers = [ ]; platforms = lib.platforms.all; - mainProgram = "shiboken6"; }; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94e68e34e589..fdbfb9e4275b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17556,6 +17556,10 @@ self: super: with self; { callPackage ../development/python-modules/shiboken6 { inherit (pkgs) cmake llvmPackages; } ); + shiboken6-generator = toPythonModule ( + callPackage ../development/python-modules/shiboken6-generator { inherit (pkgs) cmake llvmPackages; } + ); + shimmy = callPackage ../development/python-modules/shimmy { }; shiny = callPackage ../development/python-modules/shiny { };