From bf24c468f1f95bbca666287ba8bd21c627490bd9 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 19:23:54 +0800
Subject: [PATCH 1/9] qt6: 6.3.2 -> 6.4.0

---
 pkgs/development/libraries/qt-6/fetch.sh |   2 +-
 pkgs/development/libraries/qt-6/srcs.nix | 280 ++++++++++++-----------
 2 files changed, 153 insertions(+), 129 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 6849bfb40b82..c0cf16c9806b 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.2/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index d0ee4475b4f6..30fed682cc4f 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,259 +4,283 @@
 
 {
   qt3d = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt3d-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0gy73dlzj0hajxr0v68sljqvqclcryirm901icszg1mfvl4xw6zj";
-      name = "qt3d-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt3d-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1sxxxa6gaiy573j7x2k06dr4jsxbr9r1brcjfkn0zjgl46sbbgba";
+      name = "qt3d-everywhere-src-6.4.0.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt5compat-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi";
-      name = "qt5compat-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qt5compat-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1h54jiqkiipbb3i3sjznrinc67y76ld237qr17ald0pp6w45sivk";
+      name = "qt5compat-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtactiveqt-everywhere-src-6.3.2.tar.xz";
-      sha256 = "052mcwln989hp154kdrjxmif81glx4x3qcmnhss4n1ps4m28jw7w";
-      name = "qtactiveqt-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtactiveqt-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1pdam1ggxanrxr0pz8rap2ya59zyd4j56b9kfqbxm5kpkps345ar";
+      name = "qtactiveqt-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtbase = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtbase-everywhere-src-6.3.2.tar.xz";
-      sha256 = "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr";
-      name = "qtbase-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0zdkv7m98axjfpdmbv8v2xqndvhnanh75c7vgygw8rw5pnh7ar6b";
+      name = "qtbase-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtcharts-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1xpv7vijamm1iwx71wbyc7wqw9s35j1iz1ycp5c1a33hhq9lxa5a";
-      name = "qtcharts-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtcharts-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1ls077dhvkb4v7g2wwnb6v0rgg5fh4i2fx11fvzdlnsi4k7cmhr8";
+      name = "qtcharts-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtconnectivity-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0n56z6vdf4pc4jqrimsl6gd30vgac2sirz7z2v29d71ca1n6ajg2";
-      name = "qtconnectivity-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtconnectivity-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0kn52xibbp7a0021x6jznp9jxlf57fk85zba0z3lqqzanmyigp2s";
+      name = "qtconnectivity-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdatavis3d-everywhere-src-6.3.2.tar.xz";
-      sha256 = "13xg4vs3wm47f3wbh56qnrd3wa130g0z4jhf494zd7y2n5vi4r7z";
-      name = "qtdatavis3d-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdatavis3d-everywhere-src-6.4.0.tar.xz";
+      sha256 = "038591l0s9mkzxxxxm3knvyrk1vdimbp0gi5m26n79bx8lw01d0d";
+      name = "qtdatavis3d-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdeclarative-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq";
-      name = "qtdeclarative-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdeclarative-everywhere-src-6.4.0.tar.xz";
+      sha256 = "10s35iivmafprw2spca6fw3gamf10lyp54376af9437srhpyfd1l";
+      name = "qtdeclarative-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdoc-everywhere-src-6.3.2.tar.xz";
-      sha256 = "001mf5vrgjz0hbi90qcp66lbs5hv3iickfv6780j2nsc94wjc5mp";
-      name = "qtdoc-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtdoc-everywhere-src-6.4.0.tar.xz";
+      sha256 = "11j2vp2k3liz7388702ccy7fjb5ickhxnsc0iyiyirdmll187zgf";
+      name = "qtdoc-everywhere-src-6.4.0.tar.xz";
+    };
+  };
+  qthttpserver = {
+    version = "6.4.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qthttpserver-everywhere-src-6.4.0.tar.xz";
+      sha256 = "10rlmpcj36qfr4465prpb515imrcfa6b2kiz16qyr8m4c86wb51i";
+      name = "qthttpserver-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtimageformats-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0fnfhlvd12v1gk81x5zhhrkmn6k80n3zfw5in0yrqxvcmr68mjqx";
-      name = "qtimageformats-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtimageformats-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0g2zjipayhzh0lwn6xgxw5mx6f5dpak75xszm2cg1h83bnvsf68l";
+      name = "qtimageformats-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlanguageserver-everywhere-src-6.3.2.tar.xz";
-      sha256 = "00ya6lqwv2dq2g86c53aafisp5vnkgamylslg5fqd8ym29g6wraj";
-      name = "qtlanguageserver-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlanguageserver-everywhere-src-6.4.0.tar.xz";
+      sha256 = "09bhg3cm27d8imih1s7rk00zqwf863183znbzhhr3nkl6mqscy0q";
+      name = "qtlanguageserver-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlottie-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq";
-      name = "qtlottie-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtlottie-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1d66fr2my8wcbalikppiykqwisflxahcl86zgqqy2s2wkv5bzz0w";
+      name = "qtlottie-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtmultimedia-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z";
-      name = "qtmultimedia-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtmultimedia-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0vvrgqcvvr6ch5vnmq3j3lx1xci21b8vc1fv24d9aamfgj28wbp8";
+      name = "qtmultimedia-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtnetworkauth-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l";
-      name = "qtnetworkauth-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtnetworkauth-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1cqp1z73d1kgnz5l5vvgxa58mfx61kdsr9xg1wgwrwbpzpw7g6v0";
+      name = "qtnetworkauth-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtpositioning-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz";
-      name = "qtpositioning-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtpositioning-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0d58zgjzdmi2fv8wbn0iz941mlpsxclcldzadwwhh0dbdmgmq6rd";
+      name = "qtpositioning-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquick3d-everywhere-src-6.3.2.tar.xz";
-      sha256 = "00wwla3crql4wwbaz116icgc4liszi497g692z8fxllvp4ysm80x";
-      name = "qtquick3d-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3d-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1v0py2njivqbj0562pmwpfkqz1ylwkffsn7j943ky46lsih1c2pi";
+      name = "qtquick3d-everywhere-src-6.4.0.tar.xz";
+    };
+  };
+  qtquick3dphysics = {
+    version = "6.4.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
+      sha256 = "01zx50f5gmvwg2mb853hsr2hgrciyg62h365ryq5y9fi6hs48nfw";
+      name = "qtquick3dphysics-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquicktimeline-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0njidyr7ahvrq1x1676v16qcp7lz2v2rhz0x3iw2mql90vrhk2h4";
-      name = "qtquicktimeline-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtquicktimeline-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0msg0l75m0slwar9p3vpx99cyf3j3mfbajfra26jmi0haf5s5s3h";
+      name = "qtquicktimeline-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtremoteobjects-everywhere-src-6.3.2.tar.xz";
-      sha256 = "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi";
-      name = "qtremoteobjects-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtremoteobjects-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1kp1as4ih021dz37z53nv7s2byb4w04cxpj4qkxqdvvgxvmps6pm";
+      name = "qtremoteobjects-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtscxml-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1h90kiin6n4629nlzqkilhvn30q4ppr9kwbcxbsck4zss91yc6n5";
-      name = "qtscxml-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtscxml-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0r3nv4bbdab8hsvzz0d03qq977smlfmp7k4wm6n2jj2rwsjp61yl";
+      name = "qtscxml-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsensors-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1r82rpn552737n04b0wvv8g9rzqxvsr1snd22bwfb4djjn5b47j5";
-      name = "qtsensors-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsensors-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1njhrbhknbil8dllknc8p3q16k65rmqdx1gkhlcn6qlzbcphg37k";
+      name = "qtsensors-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialbus-everywhere-src-6.3.2.tar.xz";
-      sha256 = "04j5q2lwvbzp977zayj48ixwg4mkq0x58fk88l4kfkgy1xmrwgnh";
-      name = "qtserialbus-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialbus-everywhere-src-6.4.0.tar.xz";
+      sha256 = "14ga962x9h5rkgybf63b4b4fn8i96c0z9q60ns2ml20jgikmbjpg";
+      name = "qtserialbus-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialport-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0vsyqdibf8mn4481vb6sc4chgabbqzcxw1mxxm3kdik74cr0gln7";
-      name = "qtserialport-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtserialport-everywhere-src-6.4.0.tar.xz";
+      sha256 = "10s4997n3b0vp51slrjcdkkfqf8kabcn8ypz5gl2h8nfhygcqj7i";
+      name = "qtserialport-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtshadertools-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn";
-      name = "qtshadertools-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtshadertools-everywhere-src-6.4.0.tar.xz";
+      sha256 = "141vmracfa9r71l0mqilgllfb3c1ygpc913yx8pwsy411vqabmnv";
+      name = "qtshadertools-everywhere-src-6.4.0.tar.xz";
+    };
+  };
+  qtspeech = {
+    version = "6.4.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtspeech-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1xrx323vyvrgrphxvf3nxy8s7ps26pgxaj71rlgipl58jqhc4fw7";
+      name = "qtspeech-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsvg-everywhere-src-6.3.2.tar.xz";
-      sha256 = "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac";
-      name = "qtsvg-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtsvg-everywhere-src-6.4.0.tar.xz";
+      sha256 = "09av5ky5zlsz4smf3xwvk07ylkz1wz3g5hbx73xdqx6h6yaaxz83";
+      name = "qtsvg-everywhere-src-6.4.0.tar.xz";
     };
   };
   qttools = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttools-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75";
-      name = "qttools-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttools-everywhere-src-6.4.0.tar.xz";
+      sha256 = "18pv3b0y9ycbn5v98rjir8wsvsy40vy8xc5pyylfg2s5ikwdbwwp";
+      name = "qttools-everywhere-src-6.4.0.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttranslations-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg";
-      name = "qttranslations-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qttranslations-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0pwjfsi4b4fr2hw9mx76fiix0mz0wss3ic4pmd9yngk91f9kmfbs";
+      name = "qttranslations-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0czxh6wc1qgxns1qm6zcnck6i0nzaz3bzi3725qdw98738lyhvml";
-      name = "qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
+      sha256 = "087xlc7ljkbmm85n42qx0cz8rvyhfkw1dzypxp5h3c5glamhkar5";
+      name = "qtvirtualkeyboard-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwayland-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83";
-      name = "qtwayland-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwayland-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1z32bdgcril9ijqsn4d60znm610mm72rgn1a6dblvhxy9zhsi2zh";
+      name = "qtwayland-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebchannel-everywhere-src-6.3.2.tar.xz";
-      sha256 = "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni";
-      name = "qtwebchannel-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebchannel-everywhere-src-6.4.0.tar.xz";
+      sha256 = "0nk92cbdph5ri91pnh54i3bdpx1pn9pbgyysmpg59265gj1nv3sj";
+      name = "qtwebchannel-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebengine-everywhere-src-6.3.2.tar.xz";
-      sha256 = "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35";
-      name = "qtwebengine-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebengine-everywhere-src-6.4.0.tar.xz";
+      sha256 = "00skwxlin6za8wsh6ddhy7nmpabzjzj1lxf2w81fj04vb7nfjak6";
+      name = "qtwebengine-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebsockets-everywhere-src-6.3.2.tar.xz";
-      sha256 = "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q";
-      name = "qtwebsockets-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebsockets-everywhere-src-6.4.0.tar.xz";
+      sha256 = "1jlvxidjaj44hky1cwm0y8gj6zynrnd70hf44dhjcdv5rllncg7z";
+      name = "qtwebsockets-everywhere-src-6.4.0.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.3.2";
+    version = "6.4.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebview-everywhere-src-6.3.2.tar.xz";
-      sha256 = "06v69xl0fnbv4i1xbjaw7338iqyvim8d3q91qrrg7r2nqzjhiav7";
-      name = "qtwebview-everywhere-src-6.3.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.4/6.4.0/submodules/qtwebview-everywhere-src-6.4.0.tar.xz";
+      sha256 = "19z5d1gs6jm2776si9i3dxn4j70y3s8yh3m299gvb2b8fby8xfwl";
+      name = "qtwebview-everywhere-src-6.4.0.tar.xz";
     };
   };
 }

From 86c307d1f7dc0ab698a6ae8cf873612f8cef24dd Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 19:39:31 +0800
Subject: [PATCH 2/9] qt6.qtbase: drop patch for Xcursor

---
 pkgs/development/libraries/qt-6/default.nix   |  1 -
 .../qt-6/patches/0007-qtbase-xcursor.patch    | 29 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index fde9534f0ae5..8c12cc2fb671 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -49,7 +49,6 @@ let
         withGtk3 = true;
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;
-        patches = [ ./patches/0007-qtbase-xcursor.patch ];
       };
 
       qt3d = callPackage ./modules/qt3d.nix { };
diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
deleted file mode 100644
index 6a92a9528303..000000000000
--- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 17 Sep 2019 05:35:58 -0500
-Subject: [PATCH 07/10] qtbase-xcursor
-
----
- src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index fbadab4d50..c83ce0af5b 100644
---- a/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
- #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
-     static bool function_ptrs_not_initialized = true;
-     if (function_ptrs_not_initialized) {
--        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
-         bool xcursorFound = xcursorLib.load();
-         if (!xcursorFound) { // try without the version number
--            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
-             xcursorFound = xcursorLib.load();
-         }
-         if (xcursorFound) {
--- 
-2.25.1
-

From e0c3557efe0cd05ac533703889e6c035f9f3736e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 19:49:43 +0800
Subject: [PATCH 3/9] qt6.qtwebengine: fix build

---
 pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index 20cfab55d032..e4b56e7e7664 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -64,6 +64,7 @@
 , lcms2
 , re2
 , libkrb5
+, mesa
 , xkeyboard_config
 , enableProprietaryCodecs ? true
 }:
@@ -101,7 +102,7 @@ qtModule rec {
       # Manually fix unsupported shebangs
       substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
         --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
-      substituteInPlace third_party/webgpu-cts/src/tools/deno \
+      substituteInPlace third_party/webgpu-cts/src/tools/run_deno \
         --replace "/usr/bin/env -S deno" "/usr/bin/deno" || true
       patchShebangs .
     )
@@ -212,6 +213,7 @@ qtModule rec {
     pipewire
 
     libkrb5
+    mesa
   ];
 
   buildInputs = [

From 945ab9315defdbc418d6a61b6ee90c51dfb4dcdd Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:19:28 +0800
Subject: [PATCH 4/9] qt6.qthttpserver: init at 6.4.0

---
 pkgs/development/libraries/qt-6/default.nix              | 1 +
 pkgs/development/libraries/qt-6/modules/qthttpserver.nix | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-6/modules/qthttpserver.nix

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 8c12cc2fb671..5be5cee6027a 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -58,6 +58,7 @@ let
       qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
       qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
       qtdoc = callPackage ./modules/qtdoc.nix { };
+      qthttpserver = callPackage ./modules/qthttpserver.nix { };
       qtimageformats = callPackage ./modules/qtimageformats.nix { };
       qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
       qtlottie = callPackage ./modules/qtlottie.nix { };
diff --git a/pkgs/development/libraries/qt-6/modules/qthttpserver.nix b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix
new file mode 100644
index 000000000000..cd2c9d2a803c
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix
@@ -0,0 +1,9 @@
+{ qtModule
+, qtbase
+, qtwebsockets
+}:
+
+qtModule {
+  pname = "qthttpserver";
+  qtInputs = [ qtbase qtwebsockets ];
+}

From 2b96f0ca6d3a0859e76f07337685973794b27716 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:28:41 +0800
Subject: [PATCH 5/9] qt6.qtspeech: init at 6.4.0

---
 pkgs/development/libraries/qt-6/default.nix       |  1 +
 .../libraries/qt-6/modules/qtspeech.nix           | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-6/modules/qtspeech.nix

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 5be5cee6027a..22012a42f3cd 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -71,6 +71,7 @@ let
       qtserialbus = callPackage ./modules/qtserialbus.nix { };
       qtserialport = callPackage ./modules/qtserialport.nix { };
       qtshadertools = callPackage ./modules/qtshadertools.nix { };
+      qtspeech = callPackage ./modules/qtspeech.nix { };
       qtquick3d = callPackage ./modules/qtquick3d.nix { };
       qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { };
       qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { };
diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
new file mode 100644
index 000000000000..64f1e2c14a8e
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix
@@ -0,0 +1,15 @@
+{ qtModule
+, qtbase
+, qtmultimedia
+, pkg-config
+, flite
+, alsa-lib
+, speechd
+}:
+
+qtModule {
+  pname = "qtspeech";
+  qtInputs = [ qtbase qtmultimedia ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ flite alsa-lib speechd ];
+}

From f1b15aebd249a7e791f04e1906207f485303460c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:31:45 +0800
Subject: [PATCH 6/9] qt6.qtquick3dphysics: init at 6.4.0

---
 pkgs/development/libraries/qt-6/default.nix              | 1 +
 .../libraries/qt-6/modules/qtquick3dphysics.nix          | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix

diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 22012a42f3cd..7615c4f90431 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -73,6 +73,7 @@ let
       qtshadertools = callPackage ./modules/qtshadertools.nix { };
       qtspeech = callPackage ./modules/qtspeech.nix { };
       qtquick3d = callPackage ./modules/qtquick3d.nix { };
+      qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
       qtquicktimeline = callPackage ./modules/qtquicktimeline.nix { };
       qtremoteobjects = callPackage ./modules/qtremoteobjects.nix { };
       qtsvg = callPackage ./modules/qtsvg.nix { };
diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix
new file mode 100644
index 000000000000..5ace804fe4c5
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix
@@ -0,0 +1,9 @@
+{ qtModule
+, qtbase
+, qtquick3d
+}:
+
+qtModule {
+  pname = "qtquick3dphysics";
+  qtInputs = [ qtbase qtquick3d ];
+}

From de795b62a70c05ff4caf01e046ef8879421b012c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:35:47 +0800
Subject: [PATCH 7/9] mozillavpn: fix build with qt 6.4

---
 pkgs/tools/networking/mozillavpn/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix
index e963abc9b18c..4b7f63855bb2 100644
--- a/pkgs/tools/networking/mozillavpn/default.nix
+++ b/pkgs/tools/networking/mozillavpn/default.nix
@@ -84,6 +84,9 @@ stdenv.mkDerivation {
     substituteInPlace src/cmake/linux.cmake \
       --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
 
+    substituteInPlace src/connectionbenchmark/benchmarktaskdownload.cpp \
+      --replace 'QT_VERSION >= 0x060400' 'false'
+
     ln -s '${netfilter-go-modules}' linux/netfilter/vendor
   '';
 

From d3d06877baa10cd337c1db5c73f3fb275bcf7cf6 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:41:56 +0800
Subject: [PATCH 8/9] zint: fix build with qt 6.4

---
 pkgs/development/libraries/zint/default.nix   |  2 ++
 pkgs/development/libraries/zint/qobject.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/zint/qobject.patch

diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix
index ae5582f4d3be..fc6fd501c4d8 100644
--- a/pkgs/development/libraries/zint/default.nix
+++ b/pkgs/development/libraries/zint/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ozhXy7ftmGz1XvmF8AS1ifWJ3Q5hLSsysB8qLUP60n8=";
   };
 
+  patches = [ ./qobject.patch ];
+
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake wrapQtAppsHook ];
diff --git a/pkgs/development/libraries/zint/qobject.patch b/pkgs/development/libraries/zint/qobject.patch
new file mode 100644
index 000000000000..f991d52648f3
--- /dev/null
+++ b/pkgs/development/libraries/zint/qobject.patch
@@ -0,0 +1,12 @@
+diff --git a/backend_qt/qzint.h b/backend_qt/qzint.h
+index d57ab6a..62fb0a4 100644
+--- a/backend_qt/qzint.h
++++ b/backend_qt/qzint.h
+@@ -19,6 +19,7 @@
+ #ifndef QZINT_H
+ #define QZINT_H
+ 
++#include <QObject>
+ #include <QColor>
+ #include <QPainter>
+ #include "zint.h"

From 5dbec77837b6d1db4f365b3129f66bec184c2096 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 29 Sep 2022 21:52:58 +0800
Subject: [PATCH 9/9] qt6.qtbase: drop a few unused hacks

---
 pkgs/development/libraries/qt-6/modules/qtbase.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index 7a4637eb8ecd..cdae37ba54d2 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -47,7 +47,6 @@
 , icu
 , libX11
 , libXcomposite
-, libXcursor
 , libXext
 , libXi
 , libXrender
@@ -183,10 +182,6 @@ stdenv.mkDerivation rec {
     substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls
   '';
 
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/build/lib:$PWD/build/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-  '';
-
   qtPluginPrefix = "lib/qt-6/plugins";
   qtQmlPrefix = "lib/qt-6/qml";
 
@@ -201,10 +196,6 @@ stdenv.mkDerivation rec {
     "-DQT_FEATURE_openssl_linked=ON"
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
-  ];
-
   outputs = [ "out" "dev" ];
 
   postInstall = ''