Merge pull request #260239 from NickCao/qt6 · pyrox.dev/nixpkgs@9cbf22c

+10

pkgs/applications/misc/copyq/default.nix

··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch2 4 5 , cmake 5 6 , ninja 6 7 , extra-cmake-modules ··· 25 26 rev = "v${version}"; 26 27 hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg="; 27 28 }; 29 + 30 + patches = [ 31 + # itemfakevim: fix build with qt 6.6.0 32 + # https://github.com/hluk/CopyQ/pull/2508 33 + (fetchpatch2 { 34 + url = "https://github.com/hluk/CopyQ/commit/a20bfff0d78296b334ff8cabb047ab5d842b7311.patch"; 35 + hash = "sha256-F/6cQ8+O1Ttd4EFFxQas5ES6U+qxWdmYqUWRQLsVMa4="; 36 + }) 37 + ]; 28 38 29 39 nativeBuildInputs = [ 30 40 cmake

+7

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix

··· 94 94 url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; 95 95 hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; 96 96 }) 97 + # lib_base: Add missing include for Qt 6.6 98 + (fetchpatch { 99 + url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch"; 100 + stripLen = 1; 101 + extraPrefix = "Telegram/lib_base/"; 102 + hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA="; 103 + }) 97 104 ]; 98 105 99 106 postPatch = ''

+11

pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix

··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch2 4 5 , obs-studio 5 6 , cmake 6 7 , zlib ··· 26 27 hash = "sha256-NpfQ3zi+1kQNt2Lj4+1kX2bW9A/E2/MhUV1BA1UX4y0="; 27 28 fetchSubmodules = true; 28 29 }; 30 + 31 + patches = [ 32 + # fix build with qt 6.6.0 33 + # treewide: replace deprecated qAsConst with std::as_const() 34 + # https://github.com/univrsal/tuna/pull/176 35 + (fetchpatch2 { 36 + url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch"; 37 + hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k="; 38 + }) 39 + ]; 29 40 30 41 postInstall = '' 31 42 mkdir $out/lib $out/share

+11

pkgs/data/documentation/zeal/default.nix

··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch2 4 5 , cmake 5 6 , extra-cmake-modules 6 7 , pkg-config ··· 29 30 rev = "v${finalAttrs.version}"; 30 31 hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; 31 32 }; 33 + 34 + patches = [ 35 + # fix build with qt 6.6.0 36 + # treewide: replace deprecated qAsConst with std::as_const() 37 + # https://github.com/zealdocs/zeal/pull/1565 38 + (fetchpatch2 { 39 + url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; 40 + hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; 41 + }) 42 + ]; 32 43 33 44 postPatch = '' 34 45 substituteInPlace CMakeLists.txt \

+8 -14

pkgs/development/libraries/qt-6/default.nix

··· 49 49 ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch 50 50 ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch 51 51 ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch 52 - ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch 53 - ./patches/0008-qtbase-allow-translations-outside-prefix.patch 54 - ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch 55 - ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch 56 - ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch 52 + ./patches/0007-qtbase-find-tools-in-PATH.patch 53 + ./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch 54 + ./patches/0009-qtbase-allow-translations-outside-prefix.patch 55 + ./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch 56 + ./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch 57 57 ]; 58 58 }; 59 59 env = callPackage ./qt-env.nix { }; ··· 65 65 qtdatavis3d 66 66 qtdeclarative 67 67 qtdoc 68 + qtgraphs 68 69 qtgrpc 69 70 qthttpserver 70 71 qtimageformats ··· 105 106 qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; 106 107 qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; 107 108 qtdoc = callPackage ./modules/qtdoc.nix { }; 108 - qtgrpc = callPackage ./modules/qtgrpc.nix { 109 - patches = [ 110 - (fetchpatch2 { 111 - # fix compatibility with protobuf 23 112 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch"; 113 - hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok="; 114 - }) 115 - ]; 116 - }; 109 + qtgraphs = callPackage ./modules/qtgraphs.nix { }; 110 + qtgrpc = callPackage ./modules/qtgrpc.nix { }; 117 111 qthttpserver = callPackage ./modules/qthttpserver.nix { }; 118 112 qtimageformats = callPackage ./modules/qtimageformats.nix { }; 119 113 qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };

+1 -1

pkgs/development/libraries/qt-6/fetch.sh

··· 1 - WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/ -A '*.tar.xz' ) 1 + WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/ -A '*.tar.xz' )

+16

pkgs/development/libraries/qt-6/modules/qtgraphs.nix

··· 1 + { qtModule 2 + , qtbase 3 + , qtdeclarative 4 + , qtquick3d 5 + , qtquicktimeline 6 + }: 7 + 8 + qtModule { 9 + pname = "qtgraphs"; 10 + qtInputs = [ 11 + qtbase 12 + qtdeclarative 13 + qtquick3d 14 + qtquicktimeline 15 + ]; 16 + }

-2

pkgs/development/libraries/qt-6/modules/qtgrpc.nix

··· 3 3 , qtdeclarative 4 4 , protobuf 5 5 , grpc 6 - , patches ? [] 7 6 }: 8 7 9 8 qtModule { 10 9 pname = "qtgrpc"; 11 10 qtInputs = [ qtbase qtdeclarative ]; 12 11 buildInputs = [ protobuf grpc ]; 13 - inherit patches; 14 12 }

+2 -2

pkgs/development/libraries/qt-6/modules/qtmqtt.nix

··· 5 5 6 6 qtModule rec { 7 7 pname = "qtmqtt"; 8 - version = "6.5.3"; 8 + version = "6.6.0"; 9 9 src = fetchFromGitHub { 10 10 owner = "qt"; 11 11 repo = "qtmqtt"; 12 12 rev = "v${version}"; 13 - hash = "sha256-F0rq72Cvnwy2cJmw3wUL9t8ZsnI61HBRMMWRwKdSEs8="; 13 + hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI="; 14 14 }; 15 15 qtInputs = [ qtbase ]; 16 16 }

+10

pkgs/development/libraries/qt-6/modules/qtsvg.nix

··· 5 5 , libmng 6 6 , zlib 7 7 , pkg-config 8 + , fetchpatch2 8 9 }: 9 10 10 11 qtModule { ··· 12 13 qtInputs = [ qtbase ]; 13 14 buildInputs = [ libwebp jasper libmng zlib ]; 14 15 nativeBuildInputs = [ pkg-config ]; 16 + patches = [ 17 + # Fix nullptr dereference with invalid SVG 18 + # https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-117944 19 + (fetchpatch2 { 20 + name = "QTBUG-117944.patch"; 21 + url = "https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=edc8ca7f"; 22 + hash = "sha256-kBQYlQqPb0QkRhatQyaGdxE1Y5zHd6/ZEd5zn0gRVoM="; 23 + }) 24 + ]; 15 25 }

+7

pkgs/development/libraries/qt-6/modules/qttools.nix

··· 23 23 env.NIX_CFLAGS_COMPILE = toString [ 24 24 "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\"" 25 25 ]; 26 + postPatch = '' 27 + substituteInPlace \ 28 + src/qdoc/catch/CMakeLists.txt \ 29 + src/qdoc/catch_generators/CMakeLists.txt \ 30 + src/qdoc/catch_conversions/CMakeLists.txt \ 31 + --replace ''\'''${CMAKE_INSTALL_INCLUDEDIR}' "$out/include" 32 + ''; 26 33 postInstall = '' 27 34 mkdir -p "$dev" 28 35 ln -s "$out/bin" "$dev/bin"

+3 -3

pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

··· 1 - From 69d9faa9e4420d3cb0d1466c1b95ceadb2cd75f3 Mon Sep 17 00:00:00 2001 1 + From afbe4002948e60ee3b27cb9be9e549ae416373f8 Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Thu, 13 Apr 2023 23:42:29 +0800 4 - Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute 4 + Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute 5 5 path in qmake files 6 6 7 7 In generated qmake files, absolute paths to qt libraries are embedded ··· 46 46 else() 47 47 list(APPEND out_list "${library_path}") 48 48 -- 49 - 2.39.2 49 + 2.42.0 50 50

+5 -8

pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

··· 1 - From 41e32c41f781261726722628122c924abb532575 Mon Sep 17 00:00:00 2001 1 + From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Fri, 14 Apr 2023 21:43:04 +0800 4 - Subject: [PATCH 2/6] qtbase: qmake: fix mkspecs for darwin 4 + Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin 5 5 6 6 --- 7 7 mkspecs/common/mac.conf | 2 +- ··· 26 26 27 27 QMAKE_LFLAGS_REL_RPATH = 28 28 diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf 29 - index 4acf3b19d5c..aadfce875e2 100644 29 + index f364716717c..3b40328304d 100644 30 30 --- a/mkspecs/features/mac/default_post.prf 31 31 +++ b/mkspecs/features/mac/default_post.prf 32 32 @@ -1,9 +1,5 @@ ··· 39 39 contains(TEMPLATE, .*app) { 40 40 !macx-xcode:if(isEmpty(BUILDS)|build_pass) { 41 41 # Detect changes to the platform SDK 42 - @@ -15,37 +11,6 @@ contains(TEMPLATE, .*app) { 42 + @@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) { 43 43 44 44 QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) 45 45 } ··· 77 77 } 78 78 79 79 !no_objective_c:CONFIG += objective_c 80 - @@ -73,234 +38,6 @@ qt { 81 - } 82 - } 83 80 84 81 -# Add the same default rpaths as Xcode does for new projects. 85 82 -# This is especially important for iOS/tvOS/watchOS where no other option is possible. ··· 486 483 - 487 484 -load(toolchain) 488 485 -- 489 - 2.39.2 486 + 2.42.0 490 487

+5 -5

pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch

··· 1 - From f52f3c2cb1703592eaeb43e80f585a24ce8402d7 Mon Sep 17 00:00:00 2001 1 + From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Fri, 14 Apr 2023 09:34:46 +0800 4 - Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config 4 + Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config 5 5 6 6 --- 7 7 qmake/generators/makefile.cpp | 3 +-- 8 8 1 file changed, 1 insertion(+), 2 deletions(-) 9 9 10 10 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp 11 - index cc985a878b4..4e3b383d812 100644 11 + index 11d2f0ff7df..c78ed0d3485 100644 12 12 --- a/qmake/generators/makefile.cpp 13 13 +++ b/qmake/generators/makefile.cpp 14 - @@ -3403,8 +3403,7 @@ MakefileGenerator::writePkgConfigFile() 14 + @@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() 15 15 << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") 16 16 // << varGlue("DEFINES","-D"," -D"," ") 17 17 ; ··· 22 22 && libDir != QLatin1String("/Library/Frameworks")) { 23 23 t << " -F${libdir}"; 24 24 -- 25 - 2.39.2 25 + 2.42.0 26 26

+7 -7

pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch

··· 1 - From dd0dfc9cf87966f5d7493a943ec04c665be83cb6 Mon Sep 17 00:00:00 2001 1 + From b1533ac42718835499ec633ffb3b1bed0d040719 Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Fri, 14 Apr 2023 09:35:25 +0800 4 - Subject: [PATCH 4/6] qtbase: fix locating tzdir on NixOS 4 + Subject: [PATCH 04/11] qtbase: fix locating tzdir on NixOS 5 5 6 6 --- 7 7 src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++--------- 8 8 1 file changed, 17 insertions(+), 10 deletions(-) 9 9 10 10 diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp 11 - index 960a0944185..a5186acbd91 100644 11 + index e702a5d6b43..2ac88c1cd10 100644 12 12 --- a/src/corelib/time/qtimezoneprivate_tz.cpp 13 13 +++ b/src/corelib/time/qtimezoneprivate_tz.cpp 14 - @@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; 15 - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories 14 + @@ -56,7 +56,11 @@ static bool isTzFile(const QString &name); 15 + // zone1970.tab). 16 16 static QTzTimeZoneHash loadTzTimeZones() 17 17 { 18 18 - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ··· 24 24 if (!QFile::exists(path)) 25 25 path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); 26 26 27 - @@ -730,18 +734,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) 27 + @@ -773,18 +777,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) 28 28 if (!tzif.open(QIODevice::ReadOnly)) 29 29 return ret; 30 30 } else { ··· 56 56 } 57 57 } 58 58 -- 59 - 2.39.2 59 + 2.42.0 60 60

+3 -3

pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

··· 1 - From 4e8c14f1af9c332826e0454f4fd63e541edbaf5c Mon Sep 17 00:00:00 2001 1 + From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Tue, 21 Mar 2023 15:48:49 +0800 4 - Subject: [PATCH 5/6] qtbase: deal with a font face at index 0 as Regular for 4 + Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for 5 5 Variable fonts 6 6 7 7 Reference: https://bugreports.qt.io/browse/QTBUG-111994 ··· 22 22 FcObjectSetDestroy(os); 23 23 FcPatternDestroy(pattern); 24 24 -- 25 - 2.39.2 25 + 2.42.0 26 26

+3 -3

pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

··· 1 - From 61ae6e04388dd40e11c214d56f22f8f2007bf35f Mon Sep 17 00:00:00 2001 1 + From 7f573f00fb850a08017d9f1e3c73b4d7efeb84f2 Mon Sep 17 00:00:00 2001 2 2 From: Nick Cao <nickcao@nichi.co> 3 3 Date: Wed, 12 Apr 2023 10:13:50 +0800 4 - Subject: [PATCH 6/6] qtbase: qt-cmake: always use cmake from path 4 + Subject: [PATCH 06/11] qtbase: qt-cmake: always use cmake from path 5 5 6 6 The generated qt-cmake scripts embeds the absolute path of cmake used 7 7 during the build of qtbase, bloating the runtime closure of qtbase. ··· 28 28 toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" 29 29 30 30 -- 31 - 2.39.2 31 + 2.42.0 32 32

+4 -5

pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch

··· 1 - From 31d808a7b0d52a01c3f2875202cd29410a94b39a Mon Sep 17 00:00:00 2001 1 + From 95b6bc2a414d381fdeab0899a3b02499c43695e7 Mon Sep 17 00:00:00 2001 2 2 From: rewine <luhongxu@deepin.org> 3 3 Date: Wed, 29 Mar 2023 11:51:33 +0800 4 - Subject: [PATCH] qtbase-find-tools-in-PATH 4 + Subject: [PATCH 07/11] qtbase-find-tools-in-PATH 5 5 6 6 1. find qt's tools in `QTTOOLSPATH` env 7 7 qt assumes that all components use the same install prefix ··· 14 14 We can guarantee the build order of qt components in nixpkgs 15 15 tools in qttools always build before qtdoc 16 16 qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` 17 - 18 17 --- 19 18 cmake/QtDocsHelpers.cmake | 11 ++++++++--- 20 19 1 file changed, 8 insertions(+), 3 deletions(-) 21 20 22 21 diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake 23 - index 48ed5a32..9409d22d 100644 22 + index 48ed5a324bf..91d8d41fb1f 100644 24 23 --- a/cmake/QtDocsHelpers.cmake 25 24 +++ b/cmake/QtDocsHelpers.cmake 26 25 @@ -47,9 +47,14 @@ function(qt_internal_add_docs) ··· 42 41 get_target_property(target_type ${target} TYPE) 43 42 if (NOT target_type STREQUAL "INTERFACE_LIBRARY") 44 43 -- 45 - 2.38.1 44 + 2.42.0 46 45

+13 -1

pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch

··· 1 + From 28220453d157c0825669145c94ab86e9603265fa Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 10:14:40 -0400 4 + Subject: [PATCH 09/11] qtbase: allow translations outside prefix 5 + 6 + --- 7 + cmake/QtBuild.cmake | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 1 10 diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake 2 - index b45ec1d208..05f69c131b 100644 11 + index 1dc576d27af..4348eb97c37 100644 3 12 --- a/cmake/QtBuild.cmake 4 13 +++ b/cmake/QtBuild.cmake 5 14 @@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) ··· 11 20 message(FATAL_ERROR 12 21 "Path component '${name}' is outside computed install prefix: ${rel_path} ") 13 22 return() 23 + -- 24 + 2.42.0 25 +

+6 -5

pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch

··· 1 - From 505391a31aa353b8f1cc5d3feb9861582554d9f1 Mon Sep 17 00:00:00 2001 1 + From bbd9cf61b686f68d5e5eb78fb0b96a74a8921cef Mon Sep 17 00:00:00 2001 2 2 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> 3 3 Date: Wed, 9 Aug 2023 16:16:21 +0200 4 - Subject: [PATCH 1/3] Find qmlimportscanner in macdeployqt via environment 4 + Subject: [PATCH 10/11] qtbase: find qmlimportscanner in macdeployqt via 5 + environment 5 6 6 7 The qmlimportscanner tool is provided by qtdeclarative. Because of the 7 8 modularized installation in Nix, it can not be found via the usual ··· 16 17 1 file changed, 4 insertions(+) 17 18 18 19 diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp 19 - index 643fe5390a..b8fcc9c9bd 100644 20 + index 77749506ccb..48979195f40 100644 20 21 --- a/src/tools/macdeployqt/shared/shared.cpp 21 22 +++ b/src/tools/macdeployqt/shared/shared.cpp 22 - @@ -1270,6 +1270,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 23 + @@ -1273,6 +1273,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 23 24 if (!QFile::exists(qmlImportScannerPath)) 24 25 qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; 25 26 ··· 31 32 if (!QFile::exists(qmlImportScannerPath)) { 32 33 LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; 33 34 -- 34 - 2.26.2 35 + 2.42.0 35 36

+10 -10

pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch

··· 1 - From 32df59bea18bebc18d6d308750e88be325522d2e Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> 3 - Date: Thu, 10 Aug 2023 14:15:34 +0200 4 - Subject: [PATCH 2/3] Check in the QML folder of this library does actually 5 - exist 1 + From 617d27ee91aaa59c59c4f3a2cca7bab8167d9f5f Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 10:17:00 -0400 4 + Subject: [PATCH 11/11] qtbase: check in the QML folder of this library does 5 + actually exist 6 6 7 7 In a modularized installation, this folder will be the location where 8 8 `qtbase` itself is installed, but `qtbase` does not have any QML ··· 12 12 1 file changed, 5 insertions(+), 2 deletions(-) 13 13 14 14 diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp 15 - index b8fcc9c9bd..676d34d545 100644 15 + index 48979195f40..8415680ecda 100644 16 16 --- a/src/tools/macdeployqt/shared/shared.cpp 17 17 +++ b/src/tools/macdeployqt/shared/shared.cpp 18 - @@ -1290,9 +1290,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 18 + @@ -1293,9 +1293,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 19 19 } 20 20 for (const QString &importPath : qmlImportPaths) 21 21 argumentList << "-importPath" << importPath; ··· 28 28 + argumentList.append(qmlImportsPath); 29 29 + } 30 30 31 - // run qmlimportscanner 32 - QProcess qmlImportScanner; 31 + // In a modularized installation of qt as we have in Nix, instead, we will 32 + // read the paths from the environment, as they are spread in multiple 33 33 -- 34 - 2.26.2 34 + 2.42.0 35 35

+9 -9

pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch

··· 1 - From 39eb99dcd66f8ffb632fed6308a49896fe5ad2d3 Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> 3 - Date: Thu, 10 Aug 2023 14:17:03 +0200 4 - Subject: [PATCH 3/3] Pass to qmlimportscanner the QML2_IMPORT_PATH 1 + From a5cbfb30fc53b3290578af4a87fe4c0463df4247 Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 10:12:56 -0400 4 + Subject: [PATCH 08/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH 5 5 6 6 --- 7 7 src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 8 8 1 file changed, 7 insertions(+) 9 9 10 10 diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp 11 - index 676d34d545..7908b07b3c 100644 11 + index f637416cf22..77749506ccb 100644 12 12 --- a/src/tools/macdeployqt/shared/shared.cpp 13 13 +++ b/src/tools/macdeployqt/shared/shared.cpp 14 - @@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 15 - argumentList.append(qmlImportsPath); 16 - } 14 + @@ -1293,6 +1293,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf 15 + argumentList.append( "-importPath"); 16 + argumentList.append(qmlImportsPath); 17 17 18 18 + // In a modularized installation of qt as we have in Nix, instead, we will 19 19 + // read the paths from the environment, as they are spread in multiple ··· 26 26 QProcess qmlImportScanner; 27 27 qmlImportScanner.start(qmlImportScannerPath, argumentList); 28 28 -- 29 - 2.26.2 29 + 2.42.0 30 30

+22 -6

pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch

··· 1 + From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 11:12:27 -0400 4 + Subject: [PATCH] qtdeclarative: disable qml disk cache 5 + 6 + --- 7 + src/qml/jsruntime/qv4engine.cpp | 6 +----- 8 + 1 file changed, 1 insertion(+), 5 deletions(-) 9 + 1 10 diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp 2 - index 852cde9e..165f1b57 100644 11 + index d1b4c4fff6..50f8a07420 100644 3 12 --- a/src/qml/jsruntime/qv4engine.cpp 4 13 +++ b/src/qml/jsruntime/qv4engine.cpp 5 - @@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul 6 - 7 - bool ExecutionEngine::diskCacheEnabled() const 14 + @@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const 8 15 { 9 - - return (!disableDiskCache() && !debugger()) || forceDiskCache(); 10 - + return forceDiskCache(); 16 + if (forceDiskCache()) 17 + return DiskCache::Enabled; 18 + - if (disableDiskCache() || debugger()) 19 + - return DiskCache::Disabled; 20 + - static const DiskCacheOptions options = qmlGetConfigOption< 21 + - DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); 22 + - return options; 23 + + return DiskCache::Disabled; 11 24 } 12 25 13 26 void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, 27 + -- 28 + 2.42.0 29 +

+18 -17

pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch

··· 1 1 diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc 2 - index 6a3a777..249d4cc 100644 2 + index d4b0161b2e..e5a0eb1967 100644 3 3 --- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc 4 4 +++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc 5 - @@ -20,12 +20,6 @@ 6 - #include "media/base/media_log.h" 7 - #include "media/base/video_frame.h" 5 + @@ -29,12 +29,6 @@ 6 + #include "media/base/video_types.h" 7 + #include "media/video/video_encode_accelerator.h" 8 8 9 9 -// This is a min version of macOS where we want to support SVC encoding via 10 10 -// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, ··· 15 15 namespace media { 16 16 17 17 namespace { 18 - @@ -150,8 +144,6 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() { 19 - profile.max_framerate_numerator = kMaxFrameRateNumerator; 20 - profile.max_framerate_denominator = kMaxFrameRateDenominator; 21 - profile.max_resolution = gfx::Size(kMaxResolutionWidth, kMaxResolutionHeight); 18 + @@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { 19 + profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | 20 + VideoEncodeAccelerator::kVariableMode; 21 + profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); 22 22 - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) 23 23 - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); 24 + 24 25 for (const auto& supported_profile : kSupportedProfiles) { 25 - profile.profile = supported_profile; 26 - profiles.push_back(profile); 27 - @@ -595,13 +587,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( 28 - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder}; 29 - std::vector<CFTypeRef> encoder_values{kCFBooleanTrue}; 26 + if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { 27 + @@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( 28 + encoder_values.push_back(kCFBooleanFalse); 29 + } 30 30 31 31 - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { 32 - - if (require_low_delay_) { 32 + - // Remove the validation once HEVC SVC mode is supported on macOS. 33 + - if (require_low_delay_ && codec == VideoCodec::kH264) { 33 34 - encoder_keys.push_back( 34 35 - kVTVideoEncoderSpecification_EnableLowLatencyRateControl); 35 36 - encoder_values.push_back(kCFBooleanTrue); ··· 38 39 base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec = 39 40 video_toolbox::DictionaryWithKeysAndValues( 40 41 encoder_keys.data(), encoder_values.data(), encoder_keys.size()); 41 - @@ -669,19 +654,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession() { 42 - } 42 + @@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { 43 43 44 - if (num_temporal_layers_ == 2) { 44 + // Remove the validation once HEVC SVC mode is supported on macOS. 45 + if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { 45 46 - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { 46 47 - if (!session_property_setter.IsSupported( 47 48 - kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) {

+19 -5

pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch

··· 1 + From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 11:45:24 -0400 4 + Subject: [PATCH 1/2] qtwebengine: link pulseaudio 5 + 6 + --- 7 + src/core/CMakeLists.txt | 1 + 8 + 1 file changed, 1 insertion(+) 9 + 10 + diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt 11 + index 4153ce180..e89f41798 100644 1 12 --- a/src/core/CMakeLists.txt 2 13 +++ b/src/core/CMakeLists.txt 3 - @@ -341,6 +341,7 @@ 4 - devtools_fast_bundle=false 5 - devtools_skip_typecheck=false 6 - enable_jxl_decoder=false # temporarily because libjxl causes internal compiler error on armv7 14 + @@ -340,6 +340,7 @@ foreach(arch ${archs}) 15 + use_static_angle=true 16 + chrome_root_store_supported=false 17 + trial_comparison_cert_verifier_supported=false 7 18 + link_pulseaudio=true 8 19 ) 20 + extend_gn_list(gnArgArg 21 + ARGS use_v8_context_snapshot v8_use_external_startup_data 22 + -- 23 + 2.42.0 9 24 10 - extend_gn_list(gnArgArg

+15 -2

pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch

··· 1 + From 6f0068359f32d1e7ebaa32650c3b608c008a1127 Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Tue, 10 Oct 2023 11:46:28 -0400 4 + Subject: [PATCH 2/2] qtwebengine: fix path to locales 5 + 6 + --- 7 + src/core/api/CMakeLists.txt | 3 ++- 8 + src/core/web_engine_library_info.cpp | 3 ++- 9 + 2 files changed, 4 insertions(+), 2 deletions(-) 10 + 1 11 diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt 2 - index f860e0ba7..30e1a767a 100644 12 + index a3cb53e17..fcb6d70c5 100644 3 13 --- a/src/core/api/CMakeLists.txt 4 14 +++ b/src/core/api/CMakeLists.txt 5 - @@ -193,7 +193,8 @@ if(QT_FEATURE_framework) 15 + @@ -190,7 +190,8 @@ if(QT_FEATURE_framework) 6 16 7 17 else() 8 18 install(FILES ${localeFiles} ··· 26 36 % QLatin1String("qtwebengine_locales"); 27 37 candidatePaths << fallbackDir(); 28 38 } 39 + -- 40 + 2.42.0 41 +

+160 -152

pkgs/development/libraries/qt-6/srcs.nix

··· 4 4 5 5 { 6 6 qt3d = { 7 - version = "6.5.3"; 7 + version = "6.6.0"; 8 8 src = fetchurl { 9 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt3d-everywhere-src-6.5.3.tar.xz"; 10 - sha256 = "1p7x70wnqynsvd7w4jkz31amf02hwh49gqsccv5hhlpx50h9ydhd"; 11 - name = "qt3d-everywhere-src-6.5.3.tar.xz"; 9 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt3d-everywhere-src-6.6.0.tar.xz"; 10 + sha256 = "0apwq6cqxn1xszhaawrz14yyy9akbmh6i5yys3v74kbz4537ma0d"; 11 + name = "qt3d-everywhere-src-6.6.0.tar.xz"; 12 12 }; 13 13 }; 14 14 qt5compat = { 15 - version = "6.5.3"; 15 + version = "6.6.0"; 16 16 src = fetchurl { 17 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz"; 18 - sha256 = "0r34h35w0m17zyncxq2a0kichv5l4j01mximg6m5mqbifziakcpf"; 19 - name = "qt5compat-everywhere-src-6.5.3.tar.xz"; 17 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt5compat-everywhere-src-6.6.0.tar.xz"; 18 + sha256 = "1jlg3b3jn7m2gih892vcsv36rm430g86rz6bdlk15xr6c6vfv19x"; 19 + name = "qt5compat-everywhere-src-6.6.0.tar.xz"; 20 20 }; 21 21 }; 22 22 qtactiveqt = { 23 - version = "6.5.3"; 23 + version = "6.6.0"; 24 24 src = fetchurl { 25 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtactiveqt-everywhere-src-6.5.3.tar.xz"; 26 - sha256 = "1lawc0jq5w0jqjagkf7d0g9i8rrsdgrd4k34ylriy27djpd53b1j"; 27 - name = "qtactiveqt-everywhere-src-6.5.3.tar.xz"; 25 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtactiveqt-everywhere-src-6.6.0.tar.xz"; 26 + sha256 = "17ks2sggvx7p7hmg128w494n06nzyf7r5i04nykhmhqlx71wnm6j"; 27 + name = "qtactiveqt-everywhere-src-6.6.0.tar.xz"; 28 28 }; 29 29 }; 30 30 qtbase = { 31 - version = "6.5.3"; 31 + version = "6.6.0"; 32 32 src = fetchurl { 33 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz"; 34 - sha256 = "0imm0x9j7102ymcz7gl0dbnbi8qk2jmijb4gg7wh9sp41cillbyz"; 35 - name = "qtbase-everywhere-src-6.5.3.tar.xz"; 33 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz"; 34 + sha256 = "03lysc6lp17hyjrwvp0znw02bdysrff8rlsb0nlrfn6b58qm7783"; 35 + name = "qtbase-everywhere-src-6.6.0.tar.xz"; 36 36 }; 37 37 }; 38 38 qtcharts = { 39 - version = "6.5.3"; 39 + version = "6.6.0"; 40 40 src = fetchurl { 41 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz"; 42 - sha256 = "1n9fflfh47wm0fk1995dw56vyqfprwv5ialjfpcxxgzm187816sa"; 43 - name = "qtcharts-everywhere-src-6.5.3.tar.xz"; 41 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtcharts-everywhere-src-6.6.0.tar.xz"; 42 + sha256 = "1x9c55j8yscb6q18haspqnnvbc6pcgdv5ljrhj0ijxqcqz6spgp6"; 43 + name = "qtcharts-everywhere-src-6.6.0.tar.xz"; 44 44 }; 45 45 }; 46 46 qtconnectivity = { 47 - version = "6.5.3"; 47 + version = "6.6.0"; 48 48 src = fetchurl { 49 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz"; 50 - sha256 = "0nrzpqs3cq0inwp3siskxz9yxxqkz15yaf9aicnggvvic2q328i4"; 51 - name = "qtconnectivity-everywhere-src-6.5.3.tar.xz"; 49 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtconnectivity-everywhere-src-6.6.0.tar.xz"; 50 + sha256 = "04203igj3fnmw1i7k291j3p987qssss3hz58kjdz33n28xic4a8w"; 51 + name = "qtconnectivity-everywhere-src-6.6.0.tar.xz"; 52 52 }; 53 53 }; 54 54 qtdatavis3d = { 55 - version = "6.5.3"; 55 + version = "6.6.0"; 56 56 src = fetchurl { 57 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdatavis3d-everywhere-src-6.5.3.tar.xz"; 58 - sha256 = "0qf07m3bplqpm7pkn3145l2k9h0npv9qbw9gcnydzp0qdsqc1dhi"; 59 - name = "qtdatavis3d-everywhere-src-6.5.3.tar.xz"; 57 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdatavis3d-everywhere-src-6.6.0.tar.xz"; 58 + sha256 = "17jrs6mh741vfgj8bgkahfzj2xaa7agw9s6q2xcv9s8bkxnryj60"; 59 + name = "qtdatavis3d-everywhere-src-6.6.0.tar.xz"; 60 60 }; 61 61 }; 62 62 qtdeclarative = { 63 - version = "6.5.3"; 63 + version = "6.6.0"; 64 64 src = fetchurl { 65 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz"; 66 - sha256 = "05fjb70n35y42dp7g0sd99rbvmn9133z08k6rlp8ifq6sb9dcka0"; 67 - name = "qtdeclarative-everywhere-src-6.5.3.tar.xz"; 65 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdeclarative-everywhere-src-6.6.0.tar.xz"; 66 + sha256 = "0cd3gxyklhscq2zymhmv6j4pzgrl0gpx8yyhgwqg1j0qm6q9nlqv"; 67 + name = "qtdeclarative-everywhere-src-6.6.0.tar.xz"; 68 68 }; 69 69 }; 70 70 qtdoc = { 71 - version = "6.5.3"; 71 + version = "6.6.0"; 72 72 src = fetchurl { 73 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdoc-everywhere-src-6.5.3.tar.xz"; 74 - sha256 = "1k430zc8khakpcjbj7vmkgrdyrz0y6bfcfgw4dzc68gcvbwbq27g"; 75 - name = "qtdoc-everywhere-src-6.5.3.tar.xz"; 73 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdoc-everywhere-src-6.6.0.tar.xz"; 74 + sha256 = "07i6fxczbpma344jgmpcb1y24jlm136y7b698b57ipcvgbc38xnk"; 75 + name = "qtdoc-everywhere-src-6.6.0.tar.xz"; 76 + }; 77 + }; 78 + qtgraphs = { 79 + version = "6.6.0"; 80 + src = fetchurl { 81 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgraphs-everywhere-src-6.6.0.tar.xz"; 82 + sha256 = "0zsyw5w15xzmaap0r396jpsz7synq5q2knl75807f6q3i7y4gqan"; 83 + name = "qtgraphs-everywhere-src-6.6.0.tar.xz"; 76 84 }; 77 85 }; 78 86 qtgrpc = { 79 - version = "6.5.3"; 87 + version = "6.6.0"; 80 88 src = fetchurl { 81 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtgrpc-everywhere-src-6.5.3.tar.xz"; 82 - sha256 = "10wbq5zcr263g1hi06xpyvh7y2advhhy07asx4aqwf56v9rpmgvf"; 83 - name = "qtgrpc-everywhere-src-6.5.3.tar.xz"; 89 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgrpc-everywhere-src-6.6.0.tar.xz"; 90 + sha256 = "14pdqwv0yw8dgr5nr04aw73fwkljwrg3yhkflfndwnf7mmgvkffs"; 91 + name = "qtgrpc-everywhere-src-6.6.0.tar.xz"; 84 92 }; 85 93 }; 86 94 qthttpserver = { 87 - version = "6.5.3"; 95 + version = "6.6.0"; 88 96 src = fetchurl { 89 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qthttpserver-everywhere-src-6.5.3.tar.xz"; 90 - sha256 = "0ivcaqf39k7mawd17wf2db3kn8ch2ajm4gqm6wl1iqkp45aqjm05"; 91 - name = "qthttpserver-everywhere-src-6.5.3.tar.xz"; 97 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qthttpserver-everywhere-src-6.6.0.tar.xz"; 98 + sha256 = "0r9wwf239r3q7i633lld2mbmn98d7jqna1fgfxakri68x7bixbpm"; 99 + name = "qthttpserver-everywhere-src-6.6.0.tar.xz"; 92 100 }; 93 101 }; 94 102 qtimageformats = { 95 - version = "6.5.3"; 103 + version = "6.6.0"; 96 104 src = fetchurl { 97 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz"; 98 - sha256 = "1jwc2gzlymxx82khwbaav83ma8y1rl2v593jq0jd13kkkb22dh29"; 99 - name = "qtimageformats-everywhere-src-6.5.3.tar.xz"; 105 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtimageformats-everywhere-src-6.6.0.tar.xz"; 106 + sha256 = "11736il80bdcajz01l836z38g1f0k2am9ilmk203gqkn06sjqm71"; 107 + name = "qtimageformats-everywhere-src-6.6.0.tar.xz"; 100 108 }; 101 109 }; 102 110 qtlanguageserver = { 103 - version = "6.5.3"; 111 + version = "6.6.0"; 104 112 src = fetchurl { 105 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz"; 106 - sha256 = "12i1g8inp667w95gx4ldc3shb3pjd65c1x74qhmr6k2mq1sc3h60"; 107 - name = "qtlanguageserver-everywhere-src-6.5.3.tar.xz"; 113 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlanguageserver-everywhere-src-6.6.0.tar.xz"; 114 + sha256 = "03j9kbmv80sj84lbz90692ckg7nd60i6mrbg41lkgxibhqck1jdf"; 115 + name = "qtlanguageserver-everywhere-src-6.6.0.tar.xz"; 108 116 }; 109 117 }; 110 118 qtlocation = { 111 - version = "6.5.3"; 119 + version = "6.6.0"; 112 120 src = fetchurl { 113 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlocation-everywhere-src-6.5.3.tar.xz"; 114 - sha256 = "1k77ck556wkcjzly2z2p9da54hpf8x5mjhyjvn6039xzjzax232k"; 115 - name = "qtlocation-everywhere-src-6.5.3.tar.xz"; 121 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlocation-everywhere-src-6.6.0.tar.xz"; 122 + sha256 = "1507syiar3dv53km0hl2rf29518arwkk0h2b6fpj5gq8c7kqp5pm"; 123 + name = "qtlocation-everywhere-src-6.6.0.tar.xz"; 116 124 }; 117 125 }; 118 126 qtlottie = { 119 - version = "6.5.3"; 127 + version = "6.6.0"; 120 128 src = fetchurl { 121 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlottie-everywhere-src-6.5.3.tar.xz"; 122 - sha256 = "08jpm4vhcwh0a72np6fmws79v9k3dpsji5gd3ws1rh04n62lcb1x"; 123 - name = "qtlottie-everywhere-src-6.5.3.tar.xz"; 129 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlottie-everywhere-src-6.6.0.tar.xz"; 130 + sha256 = "0kzq739ziyy8xhzdj57q220sdnjcwnwkgb67gcrsdfd40x8v960x"; 131 + name = "qtlottie-everywhere-src-6.6.0.tar.xz"; 124 132 }; 125 133 }; 126 134 qtmultimedia = { 127 - version = "6.5.3"; 135 + version = "6.6.0"; 128 136 src = fetchurl { 129 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtmultimedia-everywhere-src-6.5.3.tar.xz"; 130 - sha256 = "09zzl3wywhnz5a0ym3q7nbydjcq2vj2bz7gi5p8hrhlqpg9g6r7d"; 131 - name = "qtmultimedia-everywhere-src-6.5.3.tar.xz"; 137 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtmultimedia-everywhere-src-6.6.0.tar.xz"; 138 + sha256 = "10l7sc8c7gwz47z77acvxz5wba14grwqgfpmnx0qh4gcldn26jxs"; 139 + name = "qtmultimedia-everywhere-src-6.6.0.tar.xz"; 132 140 }; 133 141 }; 134 142 qtnetworkauth = { 135 - version = "6.5.3"; 143 + version = "6.6.0"; 136 144 src = fetchurl { 137 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz"; 138 - sha256 = "00m71302b1m4hjzn0hv222yz1d8dvm9n5djgyn38ikazb5smvd1n"; 139 - name = "qtnetworkauth-everywhere-src-6.5.3.tar.xz"; 145 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtnetworkauth-everywhere-src-6.6.0.tar.xz"; 146 + sha256 = "0c48rk35qh4q9drs53jijgnhxk8adllnk63wy4rk7sq0disc1m90"; 147 + name = "qtnetworkauth-everywhere-src-6.6.0.tar.xz"; 140 148 }; 141 149 }; 142 150 qtpositioning = { 143 - version = "6.5.3"; 151 + version = "6.6.0"; 144 152 src = fetchurl { 145 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtpositioning-everywhere-src-6.5.3.tar.xz"; 146 - sha256 = "13vdklh87jz2p3miaifffi6r0ciw191b9ciaicwk0wry5fdhj6mb"; 147 - name = "qtpositioning-everywhere-src-6.5.3.tar.xz"; 153 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtpositioning-everywhere-src-6.6.0.tar.xz"; 154 + sha256 = "0fd51wgxcir8b5n6ljcfhagrkv77w6kimjx7mqzd77km7kx20rcd"; 155 + name = "qtpositioning-everywhere-src-6.6.0.tar.xz"; 148 156 }; 149 157 }; 150 158 qtquick3d = { 151 - version = "6.5.3"; 159 + version = "6.6.0"; 152 160 src = fetchurl { 153 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3d-everywhere-src-6.5.3.tar.xz"; 154 - sha256 = "0pffi1wcai6d5w18v39fdwp74za6ydjjcgbgn84y939h7xham0k6"; 155 - name = "qtquick3d-everywhere-src-6.5.3.tar.xz"; 161 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3d-everywhere-src-6.6.0.tar.xz"; 162 + sha256 = "1fkshfd0abnxd5ir8wsf57zms99cg1zhrnn40cmnr7g4jjrkxarp"; 163 + name = "qtquick3d-everywhere-src-6.6.0.tar.xz"; 156 164 }; 157 165 }; 158 166 qtquick3dphysics = { 159 - version = "6.5.3"; 167 + version = "6.6.0"; 160 168 src = fetchurl { 161 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; 162 - sha256 = "1fm4ll8cjbdjn35pbi4763sfxzj49gml2rkdr7mrzwrz4hfk149j"; 163 - name = "qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; 169 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; 170 + sha256 = "00vwzp5qwccjl65dda8s3lyf3dz1pgwhyls15qqgl338dxl5nfbl"; 171 + name = "qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; 164 172 }; 165 173 }; 166 174 qtquickeffectmaker = { 167 - version = "6.5.3"; 175 + version = "6.6.0"; 168 176 src = fetchurl { 169 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; 170 - sha256 = "19wwmal5k00l54ybb1ml2c40r4y5a1cwkd36zlri9jycs6x9nrxr"; 171 - name = "qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; 177 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; 178 + sha256 = "0zzps7wmjmnbkm37j60xc11jppk4g3nnh7qcn91q68mdqygkgjyp"; 179 + name = "qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; 172 180 }; 173 181 }; 174 182 qtquicktimeline = { 175 - version = "6.5.3"; 183 + version = "6.6.0"; 176 184 src = fetchurl { 177 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquicktimeline-everywhere-src-6.5.3.tar.xz"; 178 - sha256 = "0nvv5v5dy3ga1c1whrqdwvicmkys0psb720jycq833yqazn4qgpv"; 179 - name = "qtquicktimeline-everywhere-src-6.5.3.tar.xz"; 185 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquicktimeline-everywhere-src-6.6.0.tar.xz"; 186 + sha256 = "145mkgcacjf9ak1ydfkrqfk6371zkjgjd2v264krkv9aaza537h7"; 187 + name = "qtquicktimeline-everywhere-src-6.6.0.tar.xz"; 180 188 }; 181 189 }; 182 190 qtremoteobjects = { 183 - version = "6.5.3"; 191 + version = "6.6.0"; 184 192 src = fetchurl { 185 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtremoteobjects-everywhere-src-6.5.3.tar.xz"; 186 - sha256 = "18g78q2b9iabc1a9sgbksxj2nsiizaq4lfmxqljjq2cbzd09x74d"; 187 - name = "qtremoteobjects-everywhere-src-6.5.3.tar.xz"; 193 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtremoteobjects-everywhere-src-6.6.0.tar.xz"; 194 + sha256 = "0szpy60xdmw2spqaczib7mx7k1lnaid8micmy0jh4hmrbgir8496"; 195 + name = "qtremoteobjects-everywhere-src-6.6.0.tar.xz"; 188 196 }; 189 197 }; 190 198 qtscxml = { 191 - version = "6.5.3"; 199 + version = "6.6.0"; 192 200 src = fetchurl { 193 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtscxml-everywhere-src-6.5.3.tar.xz"; 194 - sha256 = "0ld7i84nxxzp3bm96v2ymg53kkb8fpws2vq8b5bibs2zq0m6gn7k"; 195 - name = "qtscxml-everywhere-src-6.5.3.tar.xz"; 201 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtscxml-everywhere-src-6.6.0.tar.xz"; 202 + sha256 = "0hqhi9z9cbnpbc9dx22ci3a08javb1hi9cn46h1ks1lbbpdx1v2p"; 203 + name = "qtscxml-everywhere-src-6.6.0.tar.xz"; 196 204 }; 197 205 }; 198 206 qtsensors = { 199 - version = "6.5.3"; 207 + version = "6.6.0"; 200 208 src = fetchurl { 201 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsensors-everywhere-src-6.5.3.tar.xz"; 202 - sha256 = "14y25lp296vddk3n4wpf8glshfww73dg47khhvw4s4l3b8rsgl8r"; 203 - name = "qtsensors-everywhere-src-6.5.3.tar.xz"; 209 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsensors-everywhere-src-6.6.0.tar.xz"; 210 + sha256 = "1624v0wwpdrcbz4x2jdrzb0r7qfh0qcac3k6pfikn45c9rfvxw18"; 211 + name = "qtsensors-everywhere-src-6.6.0.tar.xz"; 204 212 }; 205 213 }; 206 214 qtserialbus = { 207 - version = "6.5.3"; 215 + version = "6.6.0"; 208 216 src = fetchurl { 209 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialbus-everywhere-src-6.5.3.tar.xz"; 210 - sha256 = "13fhm8r0zp8rhbcn9i01s73kdng8afdvh5y0grqw8xqd2ncrav91"; 211 - name = "qtserialbus-everywhere-src-6.5.3.tar.xz"; 217 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialbus-everywhere-src-6.6.0.tar.xz"; 218 + sha256 = "0k5r57fsdyplbcffq9lnl0bp1smsnqh93kpk3rn5r6gaa9qz1k0q"; 219 + name = "qtserialbus-everywhere-src-6.6.0.tar.xz"; 212 220 }; 213 221 }; 214 222 qtserialport = { 215 - version = "6.5.3"; 223 + version = "6.6.0"; 216 224 src = fetchurl { 217 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialport-everywhere-src-6.5.3.tar.xz"; 218 - sha256 = "1njfhj063gw7v05ynw4frgwisl2cnlkd4xk2yf22hhmiihwsvjwr"; 219 - name = "qtserialport-everywhere-src-6.5.3.tar.xz"; 225 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialport-everywhere-src-6.6.0.tar.xz"; 226 + sha256 = "0ra0v8vc6y2s9y9irh30g1wnyhgd5xlgg6s0k9czyrvsqkqvpz7c"; 227 + name = "qtserialport-everywhere-src-6.6.0.tar.xz"; 220 228 }; 221 229 }; 222 230 qtshadertools = { 223 - version = "6.5.3"; 231 + version = "6.6.0"; 224 232 src = fetchurl { 225 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz"; 226 - sha256 = "0wrm1yp90fdqwvw8chxd2diic8zl1akr1yyyqmw8w14z80x7n6r0"; 227 - name = "qtshadertools-everywhere-src-6.5.3.tar.xz"; 233 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtshadertools-everywhere-src-6.6.0.tar.xz"; 234 + sha256 = "0xcqxwvkga11s150jha0b3iwnp4rvkvbfaxy0a0ln52hqmyk541n"; 235 + name = "qtshadertools-everywhere-src-6.6.0.tar.xz"; 228 236 }; 229 237 }; 230 238 qtspeech = { 231 - version = "6.5.3"; 239 + version = "6.6.0"; 232 240 src = fetchurl { 233 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtspeech-everywhere-src-6.5.3.tar.xz"; 234 - sha256 = "170bdch6hvmqkf4y3071ym9aqbmknn0mdbayh9rpw6lj9lng9hkr"; 235 - name = "qtspeech-everywhere-src-6.5.3.tar.xz"; 241 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtspeech-everywhere-src-6.6.0.tar.xz"; 242 + sha256 = "174zpr582nfgj19qk7qdyf4l85q0gwsjx3qfv37z0238hbzxp6wn"; 243 + name = "qtspeech-everywhere-src-6.6.0.tar.xz"; 236 244 }; 237 245 }; 238 246 qtsvg = { 239 - version = "6.5.3"; 247 + version = "6.6.0"; 240 248 src = fetchurl { 241 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz"; 242 - sha256 = "1vsvbpwh8k863nb94lrl0l8phma176b1kcfl7i3q07yad5xw8hgw"; 243 - name = "qtsvg-everywhere-src-6.5.3.tar.xz"; 249 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsvg-everywhere-src-6.6.0.tar.xz"; 250 + sha256 = "1pkj7inw76klyld3sy24gcds785lgkjs6zjac9jga0hiypz2bnik"; 251 + name = "qtsvg-everywhere-src-6.6.0.tar.xz"; 244 252 }; 245 253 }; 246 254 qttools = { 247 - version = "6.5.3"; 255 + version = "6.6.0"; 248 256 src = fetchurl { 249 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz"; 250 - sha256 = "0dsy82k7ds5yziy648mxwfz6nq2vq90g43cbnjxjarv97wmx74gw"; 251 - name = "qttools-everywhere-src-6.5.3.tar.xz"; 257 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttools-everywhere-src-6.6.0.tar.xz"; 258 + sha256 = "16ds0mclns7656hf4phv13pwhigc15z2ghqx7r2nxfrb2jyfx7sf"; 259 + name = "qttools-everywhere-src-6.6.0.tar.xz"; 252 260 }; 253 261 }; 254 262 qttranslations = { 255 - version = "6.5.3"; 263 + version = "6.6.0"; 256 264 src = fetchurl { 257 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttranslations-everywhere-src-6.5.3.tar.xz"; 258 - sha256 = "1qs9x52fqnsgk1wzrvihnr6c5cigx8zimhk3dy1qxhprvh6lrd43"; 259 - name = "qttranslations-everywhere-src-6.5.3.tar.xz"; 265 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttranslations-everywhere-src-6.6.0.tar.xz"; 266 + sha256 = "13072ll3kwb9kvw3a6sjcdific12vf81xbp41zmi1f34dwirmn50"; 267 + name = "qttranslations-everywhere-src-6.6.0.tar.xz"; 260 268 }; 261 269 }; 262 270 qtvirtualkeyboard = { 263 - version = "6.5.3"; 271 + version = "6.6.0"; 264 272 src = fetchurl { 265 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; 266 - sha256 = "0bg678dirmw5b3d46abbidkch0p5hchmqgiwvcvxfh3928aqz01i"; 267 - name = "qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; 273 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; 274 + sha256 = "0yvpz8mm3g1lj5m3fk95cqw5magfdl4y0y8frsid7gqlym1xp117"; 275 + name = "qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; 268 276 }; 269 277 }; 270 278 qtwayland = { 271 - version = "6.5.3"; 279 + version = "6.6.0"; 272 280 src = fetchurl { 273 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz"; 274 - sha256 = "17rnaap0xa0c6q8b0drm020qny0i3ia8nb0z66xq36zzny48aapp"; 275 - name = "qtwayland-everywhere-src-6.5.3.tar.xz"; 281 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwayland-everywhere-src-6.6.0.tar.xz"; 282 + sha256 = "1s5p0gfkw96nx4k2fp5s3v2rj8c05k8jc2kif0rwhl6hhlnxihrh"; 283 + name = "qtwayland-everywhere-src-6.6.0.tar.xz"; 276 284 }; 277 285 }; 278 286 qtwebchannel = { 279 - version = "6.5.3"; 287 + version = "6.6.0"; 280 288 src = fetchurl { 281 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebchannel-everywhere-src-6.5.3.tar.xz"; 282 - sha256 = "0jphdg711lhxbxg4dqrxnvkmfr2q9xzrd0h525zw94m7mfk8k7qj"; 283 - name = "qtwebchannel-everywhere-src-6.5.3.tar.xz"; 289 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebchannel-everywhere-src-6.6.0.tar.xz"; 290 + sha256 = "077mlg2zqr002z7z6yqzl3jqc05g5ahz2m06az3zjhsqdn7b7p7x"; 291 + name = "qtwebchannel-everywhere-src-6.6.0.tar.xz"; 284 292 }; 285 293 }; 286 294 qtwebengine = { 287 - version = "6.5.3"; 295 + version = "6.6.0"; 288 296 src = fetchurl { 289 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebengine-everywhere-src-6.5.3.tar.xz"; 290 - sha256 = "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"; 291 - name = "qtwebengine-everywhere-src-6.5.3.tar.xz"; 297 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz"; 298 + sha256 = "105pag9a2q611ixn5bvc45kpylhrdz5wgw6bk6zssmrcbbq9zp6m"; 299 + name = "qtwebengine-everywhere-src-6.6.0.tar.xz"; 292 300 }; 293 301 }; 294 302 qtwebsockets = { 295 - version = "6.5.3"; 303 + version = "6.6.0"; 296 304 src = fetchurl { 297 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebsockets-everywhere-src-6.5.3.tar.xz"; 298 - sha256 = "1hx7qy7rgs46ggzifp249d8zz27bjwmbv7f960lwymjdb4bsxqh4"; 299 - name = "qtwebsockets-everywhere-src-6.5.3.tar.xz"; 305 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebsockets-everywhere-src-6.6.0.tar.xz"; 306 + sha256 = "03pkgp854pb1rzjixhrbyz4ad174wfikjjisry2c90kf1ifb219f"; 307 + name = "qtwebsockets-everywhere-src-6.6.0.tar.xz"; 300 308 }; 301 309 }; 302 310 qtwebview = { 303 - version = "6.5.3"; 311 + version = "6.6.0"; 304 312 src = fetchurl { 305 - url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebview-everywhere-src-6.5.3.tar.xz"; 306 - sha256 = "0jbiwwhjp4lz4r3ym3a4wr3s966d6imffmpb0jlvkah9ji6g276g"; 307 - name = "qtwebview-everywhere-src-6.5.3.tar.xz"; 313 + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebview-everywhere-src-6.6.0.tar.xz"; 314 + sha256 = "14ikfl38ajgcv3611zjls7liscfyazf49y1plxk0pipsbndqv955"; 315 + name = "qtwebview-everywhere-src-6.6.0.tar.xz"; 308 316 }; 309 317 }; 310 318 }

+3

pkgs/development/python-modules/pyqt/6.x.nix

··· 132 132 ++ lib.optional withLocation "PyQt6.QtPositioning" 133 133 ; 134 134 135 + # fix build with qt 6.6 136 + env.NIX_CFLAGS_COMPILE = "-fpermissive"; 137 + 135 138 meta = with lib; { 136 139 description = "Python bindings for Qt6"; 137 140 homepage = "https://riverbankcomputing.com/";

+36

pkgs/games/prismlauncher/0001-launcher-translations-explicitly-convert-QVector-ite.patch

··· 1 + From c39637720109dd5d97750907c51e9c0fb8f43f0b Mon Sep 17 00:00:00 2001 2 + From: Nick Cao <nickcao@nichi.co> 3 + Date: Wed, 11 Oct 2023 22:51:23 -0400 4 + Subject: [PATCH] launcher/translations: explicitly convert QVector iterators 5 + to pointers 6 + 7 + --- 8 + launcher/translations/TranslationsModel.cpp | 5 ++--- 9 + 1 file changed, 2 insertions(+), 3 deletions(-) 10 + 11 + diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp 12 + index 2763cca2..64c21dbd 100644 13 + --- a/launcher/translations/TranslationsModel.cpp 14 + +++ b/launcher/translations/TranslationsModel.cpp 15 + @@ -524,7 +524,7 @@ Language * TranslationsModel::findLanguage(const QString& key) 16 + } 17 + else 18 + { 19 + - return found; 20 + + return &(*found); 21 + } 22 + } 23 + 24 + @@ -655,8 +655,7 @@ QModelIndex TranslationsModel::selectedIndex() 25 + auto found = findLanguage(d->m_selectedLanguage); 26 + if(found) 27 + { 28 + - // QVector iterator freely converts to pointer to contained type 29 + - return index(found - d->m_languages.begin(), 0, QModelIndex()); 30 + + return index(found - &(*d->m_languages.begin()), 0, QModelIndex()); 31 + } 32 + return QModelIndex(); 33 + } 34 + -- 35 + 2.42.0 36 +

+3 -1

pkgs/games/prismlauncher/default.nix

··· 42 42 sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; 43 43 }; 44 44 45 - patches = lib.optionals stdenv.isDarwin [ 45 + patches = [ 46 + ./0001-launcher-translations-explicitly-convert-QVector-ite.patch 47 + ] ++ lib.optionals stdenv.isDarwin [ 46 48 # https://github.com/PrismLauncher/PrismLauncher/pull/1452 47 49 # These patches allow us to disable the Sparkle updater and cmake bundling 48 50 # TODO: remove these when updating to 8.0