From 8475a67e7d18b3a0344e26441dd2df8168b0c3d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 14:22:06 -0500
Subject: [PATCH 01/10] qtbase: bootstrap with syncqt.pl

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0d82acc70929..53c55863f6f3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -115,6 +115,8 @@ stdenv.mkDerivation {
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
     sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+
+    patchShebangs ./bin
   '' + (
     if stdenv.isDarwin then ''
         sed -i \
@@ -149,6 +151,10 @@ stdenv.mkDerivation {
     ''}
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+
+    ${lib.optionalString (compareVersion "5.15.0" >= 0) ''
+    ./bin/syncqt.pl -version $version
+    ''}
   '';
 
   postConfigure = ''

From 42f44590e08670f7b78c152f6825ccd0350d40c3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 15:24:36 -0500
Subject: [PATCH 02/10] qtModule: say the magic words

---
 pkgs/development/libraries/qt-5/qtModule.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 767cbc91142d..245d94f909d2 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -31,6 +31,23 @@ mkDerivation (args // {
     ${args.preConfigure or ""}
 
     fixQtBuiltinPaths . '*.pr?'
+  '' + lib.optionalString (builtins.compareVersions "5.15.0" version <= 0)
+  # Note: We use ${version%%-*} to remove any tag from the end of the version
+  # string. Version tags are added by Nixpkgs maintainers and not reflected in
+  # the source version.
+  ''
+    if [[ -z "$dontCheckQtModuleVersion" ]] \
+        && grep -q '^MODULE_VERSION' .qmake.conf 2>/dev/null \
+        && ! grep -q -F "''${version%%-*}" .qmake.conf 2>/dev/null
+    then
+      echo >&2 "error: could not find version ''${version%%-*} in .qmake.conf"
+      echo >&2 "hint: check .qmake.conf and update the package version in Nixpkgs"
+      exit 1
+    fi
+
+    if [[ -z "$dontSyncQt" ]] && [[ -f sync.profile ]]; then
+      syncqt.pl -version "''${version%%-*}"
+    fi
   '';
 
   dontWrapQtApps = args.dontWrapQtApps or true;

From 9e65eb4cee6aea2f96e6593d0990481b44ff5ff7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 29 Oct 2021 09:34:03 -0500
Subject: [PATCH 03/10] qt515: 5.15.2 -> 5.15.3

Qt 5.15.3 does not have an official open source release, but the KDE team
maintains a collection of patches (pulled from Qt upstream) that they expect us
to carry.
---
 .../libraries/qt-5/5.15/default.nix           | 118 +++---
 pkgs/development/libraries/qt-5/5.15/fetch.sh |  61 +++-
 .../libraries/qt-5/5.15/patches.nix           |  43 +++
 pkgs/development/libraries/qt-5/5.15/srcs.nix | 342 ------------------
 .../libraries/qt-5/5.15/srcs/default.nix      |  43 +++
 .../libraries/qt-5/5.15/srcs/qt3d.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtactiveqt.json  |   9 +
 .../qt-5/5.15/srcs/qtandroidextras.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtbase.json      |   9 +
 .../libraries/qt-5/5.15/srcs/qtcharts.json    |   9 +
 .../qt-5/5.15/srcs/qtconnectivity.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtdatavis3d.json |   9 +
 .../qt-5/5.15/srcs/qtdeclarative.json         |   9 +
 .../libraries/qt-5/5.15/srcs/qtdoc.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtgamepad.json   |   9 +
 .../qt-5/5.15/srcs/qtgraphicaleffects.json    |   9 +
 .../qt-5/5.15/srcs/qtimageformats.json        |   9 +
 .../libraries/qt-5/5.15/srcs/qtlocation.json  |   9 +
 .../libraries/qt-5/5.15/srcs/qtlottie.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtmacextras.json |   9 +
 .../qt-5/5.15/srcs/qtmultimedia.json          |   9 +
 .../qt-5/5.15/srcs/qtnetworkauth.json         |   9 +
 .../qt-5/5.15/srcs/qtpurchasing.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtquick3d.json   |   9 +
 .../qt-5/5.15/srcs/qtquickcontrols.json       |   9 +
 .../qt-5/5.15/srcs/qtquickcontrols2.json      |   9 +
 .../qt-5/5.15/srcs/qtquicktimeline.json       |   9 +
 .../qt-5/5.15/srcs/qtremoteobjects.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qtscript.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtscxml.json     |   9 +
 .../libraries/qt-5/5.15/srcs/qtsensors.json   |   9 +
 .../libraries/qt-5/5.15/srcs/qtserialbus.json |   9 +
 .../qt-5/5.15/srcs/qtserialport.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtspeech.json    |   9 +
 .../libraries/qt-5/5.15/srcs/qtsvg.json       |   9 +
 .../libraries/qt-5/5.15/srcs/qttools.json     |   9 +
 .../qt-5/5.15/srcs/qttranslations.json        |   9 +
 .../qt-5/5.15/srcs/qtvirtualkeyboard.json     |   9 +
 .../libraries/qt-5/5.15/srcs/qtwayland.json   |   9 +
 .../qt-5/5.15/srcs/qtwebchannel.json          |   9 +
 .../qt-5/5.15/srcs/qtwebglplugin.json         |   9 +
 .../qt-5/5.15/srcs/qtwebsockets.json          |   9 +
 .../libraries/qt-5/5.15/srcs/qtwebview.json   |   9 +
 .../libraries/qt-5/5.15/srcs/qtwinextras.json |   9 +
 .../libraries/qt-5/5.15/srcs/qtx11extras.json |   9 +
 .../qt-5/5.15/srcs/qtxmlpatterns.json         |   9 +
 46 files changed, 569 insertions(+), 407 deletions(-)
 mode change 100644 => 100755 pkgs/development/libraries/qt-5/5.15/fetch.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.15/patches.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index a1d5be70c012..4db08b32b80c 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -2,15 +2,8 @@
 
 # Updates
 
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
-2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
+Run `./fetch.sh` to update package sources from Git.
+Check for any minor version changes.
 
 */
 
@@ -33,52 +26,61 @@ let
   stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
 
   mirror = "https://download.qt.io";
-  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
-    # qtwebkit does not have an official release tarball on the qt mirror and is
-    # mostly maintained by the community.
-    qtwebkit = rec {
-      src = fetchFromGitHub {
-        owner = "qt";
-        repo = "qtwebkit";
-        rev = "v${version}";
-        sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-      };
-      version = "5.212.0-alpha4";
-    };
-    qtwebengine =
-      let
-        branchName = "5.15.6";
-        rev = "v${branchName}-lts";
-      in
-      {
-        version = "${branchName}-${lib.substring 0 7 rev}";
-
-        src = fetchgit {
-          url = "https://github.com/qt/qtwebengine.git";
-          sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
-          inherit rev branchName;
-          fetchSubmodules = true;
-          leaveDotGit = true;
-          name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
-          postFetch = ''
-            # remove submodule .git directory
-            rm -rf "$out/src/3rdparty/.git"
-
-            # compress to not exceed the 2GB output limit
-            # try to make a deterministic tarball
-            tar -I 'gzip -n' \
-              --sort=name \
-              --mtime=1970-01-01 \
-              --owner=root --group=root \
-              --numeric-owner --mode=go=rX,u+rw,a-s \
-              --transform='s@^@source/@' \
-              -cf temp  -C "$out" .
-            rm -r "$out"
-            mv temp "$out"
-          '';
+  srcs =
+    lib.mapAttrs
+      (name: attrs:
+        {
+          inherit (attrs) version;
+          src = fetchgit (lib.importJSON attrs.json);
+        }
+      )
+      (import ./srcs)
+    // {
+      # qtwebkit does not have an official release tarball on the qt mirror and is
+      # mostly maintained by the community.
+      qtwebkit = rec {
+        src = fetchFromGitHub {
+          owner = "qt";
+          repo = "qtwebkit";
+          rev = "v${version}";
+          sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
         };
+        version = "5.212.0-alpha4";
       };
-  };
+      qtwebengine =
+        let
+          branchName = "5.15.6";
+          rev = "v${branchName}-lts";
+        in
+        {
+          version = "${branchName}-${lib.substring 0 7 rev}";
+
+          src = fetchgit {
+            url = "https://github.com/qt/qtwebengine.git";
+            sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
+            inherit rev branchName;
+            fetchSubmodules = true;
+            leaveDotGit = true;
+            name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
+            postFetch = ''
+              # remove submodule .git directory
+              rm -rf "$out/src/3rdparty/.git"
+
+              # compress to not exceed the 2GB output limit
+              # try to make a deterministic tarball
+              tar -I 'gzip -n' \
+                --sort=name \
+                --mtime=1970-01-01 \
+                --owner=root --group=root \
+                --numeric-owner --mode=go=rX,u+rw,a-s \
+                --transform='s@^@source/@' \
+                -cf temp  -C "$out" .
+              rm -r "$out"
+              mv temp "$out"
+            '';
+          };
+        };
+    };
 
   patches = {
     qtbase = lib.optionals stdenv.isDarwin [
@@ -107,16 +109,6 @@ let
       ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch
       ./qtbase.patch.d/0010-qtbase-assert.patch
       ./qtbase.patch.d/0011-fix-header_module.patch
-      (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/339323 is included in an release.
-        name = "0014-gcc11-compat.patch";
-        url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8";
-        sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc";
-      })
-      (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/363880/3 is included in an release.
-        name = "qtbase-mysql-version-vs-functionality-check.patch";
-        url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=211369133cf40b2f522caaff259c19069ed23ca4";
-        sha256 = "19kq9h10qm344fpdqa9basrbzh1y5kr48c6jzz3nvk61pk4ja1k4";
-      })
     ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
old mode 100644
new mode 100755
index 81ceb3ef77ea..e2c0d36903f7
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1,2 +1,59 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ \
-            -A '*.tar.xz' )
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-prefetch-scripts jq
+
+set -x -e -o pipefail
+
+module_list=( \
+    qt3d \
+    qtactiveqt \
+    qtandroidextras \
+    qtbase \
+    qtcharts \
+    qtconnectivity \
+    qtdatavis3d \
+    qtdeclarative \
+    qtdoc \
+    qtgamepad \
+    qtgraphicaleffects \
+    qtimageformats \
+    qtlocation \
+    qtlottie \
+    qtmacextras \
+    qtmultimedia \
+    qtnetworkauth \
+    qtpurchasing \
+    qtquick3d \
+    qtquickcontrols \
+    qtquickcontrols2 \
+    qtquicktimeline \
+    qtremoteobjects \
+    qtscript \
+    qtscxml \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtspeech \
+    qtsvg \
+    qttools \
+    qttranslations \
+    qtvirtualkeyboard \
+    qtwayland \
+    qtwebchannel \
+    qtwebglplugin \
+    qtwebsockets \
+    qtwebview \
+    qtwinextras \
+    qtx11extras \
+    qtxmlpatterns \
+    )
+
+srcs="$(dirname "${BASH_SOURCE[0]}")/srcs"
+mkdir -p "$srcs"
+
+for module in "${module_list[@]}"
+do
+    url="https://invent.kde.org/qt/qt/${module}.git"
+    nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \
+        | jq '{url,rev,sha256,fetchLFS,fetchSubmodules,deepClone,leaveDotGit}' \
+        > "${srcs}/${module}.json"
+done
diff --git a/pkgs/development/libraries/qt-5/5.15/patches.nix b/pkgs/development/libraries/qt-5/5.15/patches.nix
new file mode 100644
index 000000000000..e3a08769e8c5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/patches.nix
@@ -0,0 +1,43 @@
+{
+qt3d = {name="qt3d-5.15.patch";url="https://invent.kde.org/qt/qt/qt3d.git";fromRev="34171b1d99f55fde1627df3c57eed50480ab2ae7";toRev="7edec6e014de27b9dd03f63875c471aac606a918";sha256="12hrq0arwhfk8blqjrb24rcka9cy2asg0mpfck63khcmjhqyaic9";};
+qtactiveqt = {name="qtactiveqt-5.15.patch";url="https://invent.kde.org/qt/qt/qtactiveqt.git";fromRev="0c62d8262fb2a4779e05e95d112f08125031b640";toRev="f0d03da0e37a84029a4eae1733813521482ac1fb";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtandroidextras = {name="qtandroidextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtandroidextras.git";fromRev="505be55243ba1600f62f47f9be3011a717841096";toRev="8cce1098c59534352aa0f343ea73861f603ac04a";sha256="1zjinv99mh2w49nshprdssl1ybjb7av7m6i85pd2gc97shvn6g77";};
+qtbase = {name="qtbase-5.15.patch";url="https://invent.kde.org/qt/qt/qtbase.git";fromRev="40143c189b7c1bf3c2058b77d00ea5c4e3be8b28";toRev="c9fde86b0a2440133bc08f4811b6ca793be47f0a";sha256="0rax1ic031b14456sz3a5v2m3h6yarfv0nlfw27k41d43wrbbg1x";};
+qtcharts = {name="qtcharts-5.15.patch";url="https://invent.kde.org/qt/qt/qtcharts.git";fromRev="a67f812548b008e3eedcd2bb9313828a195fd23b";toRev="130463160b4923069eb98da49edaf7d93180f4f8";sha256="0va2ykp4lcni7xxlmpjqlwsjbal48sbwmx7kfswm7z0a9ps4py3d";};
+qtconnectivity = {name="qtconnectivity-5.15.patch";url="https://invent.kde.org/qt/qt/qtconnectivity.git";fromRev="ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea";toRev="69a87a9b831e36a578594a0a13130c384ad03121";sha256="1kjw83h66hfg2qbfcw5xnr1x5cicp2snmgz5wjqg45z5bkk517bs";};
+qtdatavis3d = {name="qtdatavis3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtdatavis3d.git";fromRev="1168c788a117e4556e6cd0ba1e267a86ef62b0c4";toRev="c085311c02dd216e5a041b90c164d55b3cf3ce92";sha256="16vzmdcfd8r4h7k28b7k48nlzn4smzf0903qjfy565ydpmwnhm07";};
+qtdeclarative = {name="qtdeclarative-5.15.patch";url="https://invent.kde.org/qt/qt/qtdeclarative.git";fromRev="104eae5b17b0ec700391e9539ee3a4f638588194";toRev="55324650f9e759a43dce927f823c9858574106c3";sha256="0jb0bcg4r8sry3dcx5am9w4qcn1zx1a30lwyr3wxry11m81lsbd0";};
+qtdoc = {name="qtdoc-5.15.patch";url="https://invent.kde.org/qt/qt/qtdoc.git";fromRev="2d00e0060b2894481c8f46577ac995aeda4a7641";toRev="897e90fe304d844beaf694b82a93a50237fa8b9e";sha256="0qfvcy6lj7fb3fazg6q6j05qdank6ba5najz3sw4m7r6dybf8nwl";};
+qtgamepad = {name="qtgamepad-5.15.patch";url="https://invent.kde.org/qt/qt/qtgamepad.git";fromRev="ff933a4e72826a77c81c4153f1adcf765ead35f0";toRev="64afa18a0a1e9588060e2e6d917bb01ccdd48a81";sha256="1gcas9mxs409rzsmmi40gf16vcy4kv17hd1sf1h7k315inixyppk";};
+qtgraphicaleffects = {name="qtgraphicaleffects-5.15.patch";url="https://invent.kde.org/qt/qt/qtgraphicaleffects.git";fromRev="66b7fbaca4b323dce337e87e3093c8836577c561";toRev="c36998dc1581167b12cc3de8e4ac68c2a5d9f76e";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtimageformats = {name="qtimageformats-5.15.patch";url="https://invent.kde.org/qt/qt/qtimageformats.git";fromRev="74a5bc4a45195b876454e596e76cb23aeb365410";toRev="cb82c74310837fe4e832c8ab72176a5d63e4355f";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtlocation = {name="qtlocation-5.15.patch";url="https://invent.kde.org/qt/qt/qtlocation.git";fromRev="02a21217a9706402802f38c646797be8eccb86e4";toRev="861e372b6ad81570d4f496e42fb25a6699b72f2f";sha256="144bz04071dcdhqi0z1yzpsbkzj634vdig11hv3y6ykh3400x606";};
+qtlottie = {name="qtlottie-5.15.patch";url="https://invent.kde.org/qt/qt/qtlottie.git";fromRev="b182dcd78a35b4667b2568857b7719d555c7fddb";toRev="fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
+qtmacextras = {name="qtmacextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtmacextras.git";fromRev="65f500c488c593486c6c390f53497dfbce1b58a6";toRev="e72896968697e2a8af16a312e1560948e4c40f30";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtmultimedia = {name="qtmultimedia-5.15.patch";url="https://invent.kde.org/qt/qt/qtmultimedia.git";fromRev="fd30913d4601d12437404e1d20113a1ed6364ccc";toRev="bd29c87027637a013f2c5e3b549fcda84e4d7545";sha256="15kvask4kabpnmwpyc1rbr8ybhnmzdycznb5r72n4f4scznzjmi8";};
+qtnetworkauth = {name="qtnetworkauth-5.15.patch";url="https://invent.kde.org/qt/qt/qtnetworkauth.git";fromRev="fb2d6d47a0c961278d63309789a1141c3734818b";toRev="53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
+qtpurchasing = {name="qtpurchasing-5.15.patch";url="https://invent.kde.org/qt/qt/qtpurchasing.git";fromRev="ddfa4d16243128d2871a51c513e025d518151b17";toRev="cbf444fb570ca4f4ca21d963d2ae4010f10d473e";sha256="0z1dax7g5p1dza5d96aayvi9chzmkrl6s3yfr3xn7jhxwf0r51fp";};
+qtquick3d = {name="qtquick3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtquick3d.git";fromRev="2e05e6d6546635a8f25882c5140fb17697be0062";toRev="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3";sha256="0kckgix393qqcpz5wlpvpkfmrj921bvnjzp13ka7dn1ys5rzac4z";};
+qtquickcontrols = {name="qtquickcontrols-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols.git";fromRev="7c29283041a50def3ceca7de4471f211c9b30d4e";toRev="cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420";sha256="0843jcggynzgv3ymvnkhgvfs44z56bmg7n2gl8f75nziwn5yi840";};
+qtquickcontrols2 = {name="qtquickcontrols2-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols2.git";fromRev="16f27dfa3588c2bf377568ce00bf534af48c9558";toRev="be66bf9a5618c745d2a6ee2262967af6307b3b07";sha256="1jjbvp9cwdxqy8lm1jm9b20w1jxl4f15sn2m0sz38bnch5n3s3kv";};
+qtquicktimeline = {name="qtquicktimeline-5.15.patch";url="https://invent.kde.org/qt/qt/qtquicktimeline.git";fromRev="147ad75c589fc4804429710fdb177cc48a80dbea";toRev="67503cdadea43b95ddad0de1a04951aff0ce1a07";sha256="0c2cdvb2l488qzpaymfl1yik21iydqrdqjf95cdjif6pnb42xwxi";};
+qtremoteobjects = {name="qtremoteobjects-5.15.patch";url="https://invent.kde.org/qt/qt/qtremoteobjects.git";fromRev="8e889442508e284691c923470eb4552c96afdfe3";toRev="4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735";sha256="11f65d8bfkj7k9jfq780hki9kwndwgvnj355w4xbfs0icm4l7ggn";};
+qtscript = {name="qtscript-5.15.patch";url="https://invent.kde.org/qt/qt/qtscript.git";fromRev="5da7de1800eee3d604eb7e787b114479b61ffc93";toRev="5cec94b2c1503f106f4ef4778d016410ebb86211";sha256="0nndn6aia39m9zfydg471fxiyjwfayvygzh600aqnl2h8d912n1x";};
+qtscxml = {name="qtscxml-5.15.patch";url="https://invent.kde.org/qt/qt/qtscxml.git";fromRev="95aa78be795a862b95371afa75e1417029ec0a16";toRev="7a15000f42c7a3171719727cd056f82a78244ed7";sha256="0b7xqd5lpkjsgivi58g7f09i9rv1dpl1b4wrfgbxlff2scfy0vjh";};
+qtsensors = {name="qtsensors-5.15.patch";url="https://invent.kde.org/qt/qt/qtsensors.git";fromRev="5618198e6df5e0224f79f786a44af7527b431545";toRev="921a31375f29e429e95352b08b2b9dbfea663cb1";sha256="1xjdw99fvnp4pb9qgj32rpj3zfh6nkb8k4ax9c8z1yk04ra0rq3n";};
+qtserialbus = {name="qtserialbus-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialbus.git";fromRev="1aa9b03756baead139943712839af5ecedeb2989";toRev="8884c5e43df846deac5a0c7c290eeb633d6bfe32";sha256="05dl7xkxwxs42shrykpq8jz9a8b9l60anp965cv4qb19zglwvcfm";};
+qtserialport = {name="qtserialport-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialport.git";fromRev="192e376b01e65e7277772bdc94106613c22cf531";toRev="941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
+qtspeech = {name="qtspeech-5.15.patch";url="https://invent.kde.org/qt/qt/qtspeech.git";fromRev="84dd22a080014cb99a7dff7772990787a04ca533";toRev="a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b";sha256="1vspazk7lh6idwnmh935fhjxa2f8yp3h7vyb3chli99ygh0386vx";};
+qtsvg = {name="qtsvg-5.15.patch";url="https://invent.kde.org/qt/qt/qtsvg.git";fromRev="52d3788c7b0116ea3db232dccca5f1e3f1e229ac";toRev="24128cdf8bef53eddf31a5709bbbc46293006b1c";sha256="018a1w6k7911ydim7h2z8mg1dqrfvllr874jqr9kylp2ymq95hhv";};
+qttools = {name="qttools-5.15.patch";url="https://invent.kde.org/qt/qt/qttools.git";fromRev="cc52debd905e0ed061290d6fd00a5f1ab67478a5";toRev="33693a928986006d79c1ee743733cde5966ac402";sha256="0hwpr3qalzn9hljakicpdwqd66mxghzqhi4896kscqy41db3mym3";};
+qttranslations = {name="qttranslations-5.15.patch";url="https://invent.kde.org/qt/qt/qttranslations.git";fromRev="cb1857418b36780b0444333f3aa6250ca3780f19";toRev="8fbbdf21f127197f97b58c7d80d2fa2a59135638";sha256="0p47ima4dn8sjhhg6c0qr0jip0q4akvi5xm2wxj62dlzr8d0zv14";};
+qtvirtualkeyboard = {name="qtvirtualkeyboard-5.15.patch";url="https://invent.kde.org/qt/qt/qtvirtualkeyboard.git";fromRev="7b90415c58dd02c682a9ba317f273d7b3398ff88";toRev="353b75b2e34bdae901625bbddf5c5e3f3e6c0de5";sha256="19azki7yi83dkc05asclrkj0lf14x927l30xpg5lj2p2mz1cf1mr";};
+qtwayland = {name="qtwayland-5.15.patch";url="https://invent.kde.org/qt/qt/qtwayland.git";fromRev="3cc17177b1b03053276eb6236fda137c588261a7";toRev="992833ca741efe8f533c61abfaf129a1d8bfcfee";sha256="072zp6fksjig1y1cw4jm7wv60qd9hdci7cx1hxhfw1r4c7k012wp";};
+qtwebchannel = {name="qtwebchannel-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebchannel.git";fromRev="90cffd49575b075b0dc28440c693753d860fee87";toRev="47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38";sha256="0irxngxg23kwf7zmbr5k5lzqfbyf1zh5smjkpl3dvx444qqxgrdl";};
+qtwebglplugin = {name="qtwebglplugin-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebglplugin.git";fromRev="5e41e564aaf96b7e49403af5099995efbe4cac8e";toRev="550a8cee241bbf8c11863dec9587d579dcb1108b";sha256="12iv161qmapakrb4awkpqzwq4r366fbgm344p0b3zsw7jzkqigw8";};
+qtwebsockets = {name="qtwebsockets-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebsockets.git";fromRev="f73735911b2124ef16aa39228bf8f89ee900ba5d";toRev="e7883bc64440b1ff4666272ac6eb710ee4bc221b";sha256="0sjg8m2sd6rlg5asjb6ddh8rd6c0pp7l1532al1br00b861al5yi";};
+qtwebview = {name="qtwebview-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebview.git";fromRev="800926cc4e0ecfdb37a3b34486403354b66a37a4";toRev="920de5f1cd9f9001cfef1bfd2c19e6720793362f";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtwinextras = {name="qtwinextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtwinextras.git";fromRev="41f2492a30be21f28c8b0b7b932b886536fc9916";toRev="3df03dab21f3e84d5a7274c64dd879854ca1bfe7";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
+qtx11extras = {name="qtx11extras-5.15.patch";url="https://invent.kde.org/qt/qt/qtx11extras.git";fromRev="9bb0adeac84da6723cf57a2bb0d0c3b405691a15";toRev="3898f5484fd4864b047729bfeda9a1222f32364f";sha256="0al27mckfgfcrqvf0x3didaina2rj4xi3hp6vdpz5i6p3z4ws8wq";};
+qtxmlpatterns = {name="qtxmlpatterns-5.15.patch";url="https://invent.kde.org/qt/qt/qtxmlpatterns.git";fromRev="50421402f05b3ee3c76c6cff455a69efaf576b6d";toRev="189e28d0aff1f3d7960228ba318b83e3cadac98c";sha256="0hxsxk6l4x8h6q053lm65wxkl3di3qx9z8rjn0w1nxs051q1szch";};
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
deleted file mode 100644
index 70e9c3a80225..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ /dev/null
@@ -1,342 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d";
-      name = "qt3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz";
-      sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c";
-      name = "qtactiveqt-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd";
-      name = "qtandroidextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz";
-      sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8";
-      name = "qtbase-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz";
-      sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11";
-      name = "qtcharts-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz";
-      sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0";
-      name = "qtconnectivity-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd";
-      name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651";
-      name = "qtdeclarative-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4";
-      name = "qtdoc-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c";
-      name = "qtgamepad-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
-      sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4";
-      name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz";
-      sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7";
-      name = "qtimageformats-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz";
-      sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0";
-      name = "qtlocation-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtlottie = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz";
-      sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517";
-      name = "qtlottie-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e";
-      name = "qtmacextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz";
-      sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5";
-      name = "qtmultimedia-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtnetworkauth = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz";
-      sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85";
-      name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz";
-      sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227";
-      name = "qtpurchasing-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquick3d = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz";
-      sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb";
-      name = "qtquick3d-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5";
-      name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
-      sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919";
-      name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtquicktimeline = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz";
-      sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28";
-      name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtremoteobjects = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz";
-      sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2";
-      name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e";
-      name = "qtscript-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz";
-      sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc";
-      name = "qtscxml-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz";
-      sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839";
-      name = "qtsensors-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz";
-      sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88";
-      name = "qtserialbus-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz";
-      sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d";
-      name = "qtserialport-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtspeech = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5";
-      name = "qtspeech-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz";
-      sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e";
-      name = "qtsvg-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc";
-      name = "qttools-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz";
-      sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8";
-      name = "qttranslations-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
-      sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55";
-      name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz";
-      sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5";
-      name = "qtwayland-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz";
-      sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1";
-      name = "qtwebchannel-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz";
-      sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0";
-      name = "qtwebengine-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebglplugin = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz";
-      sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446";
-      name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz";
-      sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f";
-      name = "qtwebsockets-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz";
-      sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7";
-      name = "qtwebview-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e";
-      name = "qtwinextras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz";
-      sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e";
-      name = "qtx11extras-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.15.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
-      sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa";
-      name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
new file mode 100644
index 000000000000..929ab60d4d66
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
@@ -0,0 +1,43 @@
+{
+  qt3d = { version = "5.15.3"; json = ./qt3d.json; };
+  qtactiveqt = { version = "5.15.3"; json = ./qtactiveqt.json; };
+  qtandroidextras = { version = "5.15.3"; json = ./qtandroidextras.json; };
+  qtbase = { version = "5.15.3"; json = ./qtbase.json; };
+  qtcharts = { version = "5.15.3"; json = ./qtcharts.json; };
+  qtconnectivity = { version = "5.15.3"; json = ./qtconnectivity.json; };
+  qtdatavis3d = { version = "5.15.3"; json = ./qtdatavis3d.json; };
+  qtdeclarative = { version = "5.15.3"; json = ./qtdeclarative.json; };
+  qtdoc = { version = "5.15.3"; json = ./qtdoc.json; };
+  qtgamepad = { version = "5.15.3"; json = ./qtgamepad.json; };
+  qtgraphicaleffects = { version = "5.15.3"; json = ./qtgraphicaleffects.json; };
+  qtimageformats = { version = "5.15.3"; json = ./qtimageformats.json; };
+  qtlocation = { version = "5.15.3"; json = ./qtlocation.json; };
+  qtlottie = { version = "5.15.3"; json = ./qtlottie.json; };
+  qtmacextras = { version = "5.15.3"; json = ./qtmacextras.json; };
+  qtmultimedia = { version = "5.15.3"; json = ./qtmultimedia.json; };
+  qtnetworkauth = { version = "5.15.3"; json = ./qtnetworkauth.json; };
+  qtpurchasing = { version = "5.15.3"; json = ./qtpurchasing.json; };
+  qtquick3d = { version = "5.15.3"; json = ./qtquick3d.json; };
+  qtquickcontrols = { version = "5.15.3"; json = ./qtquickcontrols.json; };
+  qtquickcontrols2 = { version = "5.15.3"; json = ./qtquickcontrols2.json; };
+  qtquicktimeline = { version = "5.15.3"; json = ./qtquicktimeline.json; };
+  qtremoteobjects = { version = "5.15.3"; json = ./qtremoteobjects.json; };
+  qtscript = { version = "5.15.4"; json = ./qtscript.json; };
+  qtscxml = { version = "5.15.3"; json = ./qtscxml.json; };
+  qtsensors = { version = "5.15.3"; json = ./qtsensors.json; };
+  qtserialbus = { version = "5.15.3"; json = ./qtserialbus.json; };
+  qtserialport = { version = "5.15.3"; json = ./qtserialport.json; };
+  qtspeech = { version = "5.15.3"; json = ./qtspeech.json; };
+  qtsvg = { version = "5.15.3"; json = ./qtsvg.json; };
+  qttools = { version = "5.15.3"; json = ./qttools.json; };
+  qttranslations = { version = "5.15.3"; json = ./qttranslations.json; };
+  qtvirtualkeyboard = { version = "5.15.3"; json = ./qtvirtualkeyboard.json; };
+  qtwayland = { version = "5.15.3"; json = ./qtwayland.json; };
+  qtwebchannel = { version = "5.15.3"; json = ./qtwebchannel.json; };
+  qtwebglplugin = { version = "5.15.3"; json = ./qtwebglplugin.json; };
+  qtwebsockets = { version = "5.15.3"; json = ./qtwebsockets.json; };
+  qtwebview = { version = "5.15.3"; json = ./qtwebview.json; };
+  qtwinextras = { version = "5.15.3"; json = ./qtwinextras.json; };
+  qtx11extras = { version = "5.15.3"; json = ./qtx11extras.json; };
+  qtxmlpatterns = { version = "5.15.3"; json = ./qtxmlpatterns.json; };
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
new file mode 100644
index 000000000000..2beb42f0fe96
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qt3d.git",
+  "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
+  "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
new file mode 100644
index 000000000000..01e514ebb66d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
+  "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
+  "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
new file mode 100644
index 000000000000..62ceb5aa8f98
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
+  "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
+  "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
new file mode 100644
index 000000000000..37e249040f14
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtbase.git",
+  "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
+  "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
new file mode 100644
index 000000000000..560489a6e217
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtcharts.git",
+  "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
+  "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
new file mode 100644
index 000000000000..c606975bfe51
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
+  "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
+  "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
new file mode 100644
index 000000000000..278e3ec4df62
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
+  "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
+  "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
new file mode 100644
index 000000000000..868c49c5a2ea
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
+  "rev": "55324650f9e759a43dce927f823c9858574106c3",
+  "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
new file mode 100644
index 000000000000..c00f65fd10d3
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtdoc.git",
+  "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
+  "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
new file mode 100644
index 000000000000..f3cbee2dedc7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
+  "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
+  "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
new file mode 100644
index 000000000000..c78f288919f9
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
+  "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
+  "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
new file mode 100644
index 000000000000..28795710b1e9
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
+  "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
+  "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
new file mode 100644
index 000000000000..4ed826b65562
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtlocation.git",
+  "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
+  "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
new file mode 100644
index 000000000000..ed255997b77b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtlottie.git",
+  "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
+  "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
new file mode 100644
index 000000000000..9aa1128ce26e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
+  "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
+  "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
new file mode 100644
index 000000000000..93b26b6734eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
+  "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
+  "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
new file mode 100644
index 000000000000..fa0c49185f52
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
+  "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
+  "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
new file mode 100644
index 000000000000..90c086794cbe
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
+  "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
+  "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
new file mode 100644
index 000000000000..3cb8d7dcc809
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
+  "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
+  "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
new file mode 100644
index 000000000000..6bd93cf62c32
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
+  "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
+  "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
new file mode 100644
index 000000000000..fcacda36609f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
+  "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
+  "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
new file mode 100644
index 000000000000..3a99df32920b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
+  "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
+  "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
new file mode 100644
index 000000000000..5b1aefb8d40a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
+  "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
+  "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
new file mode 100644
index 000000000000..3aefd77854c5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtscript.git",
+  "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
+  "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
new file mode 100644
index 000000000000..b792b71119cf
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtscxml.git",
+  "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
+  "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
new file mode 100644
index 000000000000..2d2e1c7ea689
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtsensors.git",
+  "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
+  "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
new file mode 100644
index 000000000000..cea79ff4c553
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
+  "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
+  "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
new file mode 100644
index 000000000000..a4e09c149052
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtserialport.git",
+  "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
+  "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
new file mode 100644
index 000000000000..317bafe92c16
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtspeech.git",
+  "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
+  "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
new file mode 100644
index 000000000000..9e4d5b2ea870
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtsvg.git",
+  "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
+  "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
new file mode 100644
index 000000000000..9045142a54ee
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qttools.git",
+  "rev": "33693a928986006d79c1ee743733cde5966ac402",
+  "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
new file mode 100644
index 000000000000..09e8ac32031a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qttranslations.git",
+  "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
+  "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
new file mode 100644
index 000000000000..76a20b6ca5d5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
+  "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
+  "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
new file mode 100644
index 000000000000..25b267c66c1f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwayland.git",
+  "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
+  "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
new file mode 100644
index 000000000000..fa6ac0bd1b74
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
+  "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
+  "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
new file mode 100644
index 000000000000..386a8aa143d2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
+  "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
+  "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
new file mode 100644
index 000000000000..23c2c9ae5384
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
+  "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
+  "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
new file mode 100644
index 000000000000..27a93a97da54
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwebview.git",
+  "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
+  "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
new file mode 100644
index 000000000000..30847e67e560
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
+  "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
+  "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
new file mode 100644
index 000000000000..4c4d665e287a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
+  "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
+  "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
new file mode 100644
index 000000000000..6363cb262967
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
@@ -0,0 +1,9 @@
+{
+  "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
+  "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
+  "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

From 999557e8ef79f0a52455fae9f8519ce801f9dabd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 08:26:42 -0500
Subject: [PATCH 04/10] sddm: fix build with Qt 5.15.3

---
 pkgs/applications/display-managers/sddm/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 029501c7787a..091498fae003 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -25,6 +25,12 @@ in mkDerivation {
       url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
       sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
     })
+    # Fix build with Qt 5.15.3
+    # See: https://github.com/sddm/sddm/pull/1325
+    (fetchpatch {
+      url = "https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308.patch";
+      sha256 = "sha256:1rh6sdvzivjcl5b05fczarvxhgpjhi7019hvf2gadnwgwdg104r4";
+    })
   ];
 
   postPatch =

From 965fcab9693908b1ae657b7e64f7adb73355432f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 10:53:48 -0500
Subject: [PATCH 05/10] qt515: combine source locks into single JSON file

---
 .../libraries/qt-5/5.15/default.nix           |   9 +-
 pkgs/development/libraries/qt-5/5.15/fetch.sh |  60 +----
 pkgs/development/libraries/qt-5/5.15/modules  |  41 ++++
 .../libraries/qt-5/5.15/srcs-generated.json   | 207 ++++++++++++++++++
 pkgs/development/libraries/qt-5/5.15/srcs.nix |  25 +++
 .../libraries/qt-5/5.15/srcs/default.nix      |  43 ----
 .../libraries/qt-5/5.15/srcs/qt3d.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtactiveqt.json  |   9 -
 .../qt-5/5.15/srcs/qtandroidextras.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtbase.json      |   9 -
 .../libraries/qt-5/5.15/srcs/qtcharts.json    |   9 -
 .../qt-5/5.15/srcs/qtconnectivity.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtdatavis3d.json |   9 -
 .../qt-5/5.15/srcs/qtdeclarative.json         |   9 -
 .../libraries/qt-5/5.15/srcs/qtdoc.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtgamepad.json   |   9 -
 .../qt-5/5.15/srcs/qtgraphicaleffects.json    |   9 -
 .../qt-5/5.15/srcs/qtimageformats.json        |   9 -
 .../libraries/qt-5/5.15/srcs/qtlocation.json  |   9 -
 .../libraries/qt-5/5.15/srcs/qtlottie.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtmacextras.json |   9 -
 .../qt-5/5.15/srcs/qtmultimedia.json          |   9 -
 .../qt-5/5.15/srcs/qtnetworkauth.json         |   9 -
 .../qt-5/5.15/srcs/qtpurchasing.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtquick3d.json   |   9 -
 .../qt-5/5.15/srcs/qtquickcontrols.json       |   9 -
 .../qt-5/5.15/srcs/qtquickcontrols2.json      |   9 -
 .../qt-5/5.15/srcs/qtquicktimeline.json       |   9 -
 .../qt-5/5.15/srcs/qtremoteobjects.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qtscript.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtscxml.json     |   9 -
 .../libraries/qt-5/5.15/srcs/qtsensors.json   |   9 -
 .../libraries/qt-5/5.15/srcs/qtserialbus.json |   9 -
 .../qt-5/5.15/srcs/qtserialport.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtspeech.json    |   9 -
 .../libraries/qt-5/5.15/srcs/qtsvg.json       |   9 -
 .../libraries/qt-5/5.15/srcs/qttools.json     |   9 -
 .../qt-5/5.15/srcs/qttranslations.json        |   9 -
 .../qt-5/5.15/srcs/qtvirtualkeyboard.json     |   9 -
 .../libraries/qt-5/5.15/srcs/qtwayland.json   |   9 -
 .../qt-5/5.15/srcs/qtwebchannel.json          |   9 -
 .../qt-5/5.15/srcs/qtwebglplugin.json         |   9 -
 .../qt-5/5.15/srcs/qtwebsockets.json          |   9 -
 .../libraries/qt-5/5.15/srcs/qtwebview.json   |   9 -
 .../libraries/qt-5/5.15/srcs/qtwinextras.json |   9 -
 .../libraries/qt-5/5.15/srcs/qtx11extras.json |   9 -
 .../qt-5/5.15/srcs/qtxmlpatterns.json         |   9 -
 47 files changed, 283 insertions(+), 471 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.15/modules
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs-generated.json
 create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 4db08b32b80c..1659dc51ae27 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -27,14 +27,7 @@ let
 
   mirror = "https://download.qt.io";
   srcs =
-    lib.mapAttrs
-      (name: attrs:
-        {
-          inherit (attrs) version;
-          src = fetchgit (lib.importJSON attrs.json);
-        }
-      )
-      (import ./srcs)
+    import ./srcs.nix { inherit lib fetchgit; }
     // {
       # qtwebkit does not have an official release tarball on the qt mirror and is
       # mostly maintained by the community.
diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
index e2c0d36903f7..e97dee310d07 100755
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -3,57 +3,15 @@
 
 set -x -e -o pipefail
 
-module_list=( \
-    qt3d \
-    qtactiveqt \
-    qtandroidextras \
-    qtbase \
-    qtcharts \
-    qtconnectivity \
-    qtdatavis3d \
-    qtdeclarative \
-    qtdoc \
-    qtgamepad \
-    qtgraphicaleffects \
-    qtimageformats \
-    qtlocation \
-    qtlottie \
-    qtmacextras \
-    qtmultimedia \
-    qtnetworkauth \
-    qtpurchasing \
-    qtquick3d \
-    qtquickcontrols \
-    qtquickcontrols2 \
-    qtquicktimeline \
-    qtremoteobjects \
-    qtscript \
-    qtscxml \
-    qtsensors \
-    qtserialbus \
-    qtserialport \
-    qtspeech \
-    qtsvg \
-    qttools \
-    qttranslations \
-    qtvirtualkeyboard \
-    qtwayland \
-    qtwebchannel \
-    qtwebglplugin \
-    qtwebsockets \
-    qtwebview \
-    qtwinextras \
-    qtx11extras \
-    qtxmlpatterns \
-    )
+here="$(dirname "${BASH_SOURCE[0]}")"
+modules="${here}/modules"
+srcs="${here}/srcs-generated.json"
 
-srcs="$(dirname "${BASH_SOURCE[0]}")/srcs"
-mkdir -p "$srcs"
-
-for module in "${module_list[@]}"
-do
+while read -r module; do
+    if [[ -z "$module" ]]; then continue; fi
     url="https://invent.kde.org/qt/qt/${module}.git"
     nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \
-        | jq '{url,rev,sha256,fetchLFS,fetchSubmodules,deepClone,leaveDotGit}' \
-        > "${srcs}/${module}.json"
-done
+        | jq "{key: \"${module}\", value: {url,rev,sha256}}"
+done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp"
+
+mv "${srcs}.tmp" "$srcs"
diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules
new file mode 100644
index 000000000000..d6ce8822d541
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/modules
@@ -0,0 +1,41 @@
+qt3d
+qtactiveqt
+qtandroidextras
+qtbase
+qtcharts
+qtconnectivity
+qtdatavis3d
+qtdeclarative
+qtdoc
+qtgamepad
+qtgraphicaleffects
+qtimageformats
+qtlocation
+qtlottie
+qtmacextras
+qtmultimedia
+qtnetworkauth
+qtpurchasing
+qtquick3d
+qtquickcontrols
+qtquickcontrols2
+qtquicktimeline
+qtremoteobjects
+qtscript
+qtscxml
+qtsensors
+qtserialbus
+qtserialport
+qtspeech
+qtsvg
+qttools
+qttranslations
+qtvirtualkeyboard
+qtwayland
+qtwebchannel
+qtwebglplugin
+qtwebsockets
+qtwebview
+qtwinextras
+qtx11extras
+qtxmlpatterns
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
new file mode 100644
index 000000000000..76c4237dcaf7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -0,0 +1,207 @@
+{
+  "qt3d": {
+    "url": "https://invent.kde.org/qt/qt/qt3d.git",
+    "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
+    "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59"
+  },
+  "qtactiveqt": {
+    "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
+    "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
+    "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6"
+  },
+  "qtandroidextras": {
+    "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
+    "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
+    "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6"
+  },
+  "qtbase": {
+    "url": "https://invent.kde.org/qt/qt/qtbase.git",
+    "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
+    "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp"
+  },
+  "qtcharts": {
+    "url": "https://invent.kde.org/qt/qt/qtcharts.git",
+    "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
+    "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw"
+  },
+  "qtconnectivity": {
+    "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
+    "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
+    "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw"
+  },
+  "qtdatavis3d": {
+    "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
+    "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
+    "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj"
+  },
+  "qtdeclarative": {
+    "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
+    "rev": "55324650f9e759a43dce927f823c9858574106c3",
+    "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0"
+  },
+  "qtdoc": {
+    "url": "https://invent.kde.org/qt/qt/qtdoc.git",
+    "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
+    "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1"
+  },
+  "qtgamepad": {
+    "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
+    "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
+    "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46"
+  },
+  "qtgraphicaleffects": {
+    "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
+    "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
+    "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8"
+  },
+  "qtimageformats": {
+    "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
+    "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
+    "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr"
+  },
+  "qtlocation": {
+    "url": "https://invent.kde.org/qt/qt/qtlocation.git",
+    "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
+    "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52"
+  },
+  "qtlottie": {
+    "url": "https://invent.kde.org/qt/qt/qtlottie.git",
+    "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
+    "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r"
+  },
+  "qtmacextras": {
+    "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
+    "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
+    "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms"
+  },
+  "qtmultimedia": {
+    "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
+    "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
+    "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94"
+  },
+  "qtnetworkauth": {
+    "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
+    "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
+    "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2"
+  },
+  "qtpurchasing": {
+    "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
+    "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
+    "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp"
+  },
+  "qtquick3d": {
+    "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
+    "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
+    "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s"
+  },
+  "qtquickcontrols": {
+    "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
+    "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
+    "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc"
+  },
+  "qtquickcontrols2": {
+    "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
+    "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
+    "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks"
+  },
+  "qtquicktimeline": {
+    "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
+    "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
+    "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid"
+  },
+  "qtremoteobjects": {
+    "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
+    "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
+    "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146"
+  },
+  "qtscript": {
+    "url": "https://invent.kde.org/qt/qt/qtscript.git",
+    "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
+    "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1"
+  },
+  "qtscxml": {
+    "url": "https://invent.kde.org/qt/qt/qtscxml.git",
+    "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
+    "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq"
+  },
+  "qtsensors": {
+    "url": "https://invent.kde.org/qt/qt/qtsensors.git",
+    "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
+    "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8"
+  },
+  "qtserialbus": {
+    "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
+    "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
+    "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5"
+  },
+  "qtserialport": {
+    "url": "https://invent.kde.org/qt/qt/qtserialport.git",
+    "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
+    "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx"
+  },
+  "qtspeech": {
+    "url": "https://invent.kde.org/qt/qt/qtspeech.git",
+    "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
+    "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5"
+  },
+  "qtsvg": {
+    "url": "https://invent.kde.org/qt/qt/qtsvg.git",
+    "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
+    "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56"
+  },
+  "qttools": {
+    "url": "https://invent.kde.org/qt/qt/qttools.git",
+    "rev": "33693a928986006d79c1ee743733cde5966ac402",
+    "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n"
+  },
+  "qttranslations": {
+    "url": "https://invent.kde.org/qt/qt/qttranslations.git",
+    "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
+    "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7"
+  },
+  "qtvirtualkeyboard": {
+    "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
+    "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
+    "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5"
+  },
+  "qtwayland": {
+    "url": "https://invent.kde.org/qt/qt/qtwayland.git",
+    "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
+    "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7"
+  },
+  "qtwebchannel": {
+    "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
+    "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
+    "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d"
+  },
+  "qtwebglplugin": {
+    "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
+    "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
+    "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515"
+  },
+  "qtwebsockets": {
+    "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
+    "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
+    "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca"
+  },
+  "qtwebview": {
+    "url": "https://invent.kde.org/qt/qt/qtwebview.git",
+    "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
+    "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f"
+  },
+  "qtwinextras": {
+    "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
+    "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
+    "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx"
+  },
+  "qtx11extras": {
+    "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
+    "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
+    "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra"
+  },
+  "qtxmlpatterns": {
+    "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
+    "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
+    "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq"
+  }
+}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
new file mode 100644
index 000000000000..9527b8aa4071
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -0,0 +1,25 @@
+{ lib, fetchgit }:
+
+let
+  version = "5.15.3";
+  overrides = {
+    qtscript.version = "5.15.4";
+  };
+
+  mk = name: args:
+    let
+      override = overrides.${name} or {};
+    in
+    {
+      version = override.version or version;
+      src = override.src or
+        fetchgit {
+          inherit (args) url rev sha256;
+          fetchLFS = false;
+          fetchSubmodules = false;
+          deepClone = false;
+          leaveDotGit = false;
+        };
+    };
+in
+lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix b/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
deleted file mode 100644
index 929ab60d4d66..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  qt3d = { version = "5.15.3"; json = ./qt3d.json; };
-  qtactiveqt = { version = "5.15.3"; json = ./qtactiveqt.json; };
-  qtandroidextras = { version = "5.15.3"; json = ./qtandroidextras.json; };
-  qtbase = { version = "5.15.3"; json = ./qtbase.json; };
-  qtcharts = { version = "5.15.3"; json = ./qtcharts.json; };
-  qtconnectivity = { version = "5.15.3"; json = ./qtconnectivity.json; };
-  qtdatavis3d = { version = "5.15.3"; json = ./qtdatavis3d.json; };
-  qtdeclarative = { version = "5.15.3"; json = ./qtdeclarative.json; };
-  qtdoc = { version = "5.15.3"; json = ./qtdoc.json; };
-  qtgamepad = { version = "5.15.3"; json = ./qtgamepad.json; };
-  qtgraphicaleffects = { version = "5.15.3"; json = ./qtgraphicaleffects.json; };
-  qtimageformats = { version = "5.15.3"; json = ./qtimageformats.json; };
-  qtlocation = { version = "5.15.3"; json = ./qtlocation.json; };
-  qtlottie = { version = "5.15.3"; json = ./qtlottie.json; };
-  qtmacextras = { version = "5.15.3"; json = ./qtmacextras.json; };
-  qtmultimedia = { version = "5.15.3"; json = ./qtmultimedia.json; };
-  qtnetworkauth = { version = "5.15.3"; json = ./qtnetworkauth.json; };
-  qtpurchasing = { version = "5.15.3"; json = ./qtpurchasing.json; };
-  qtquick3d = { version = "5.15.3"; json = ./qtquick3d.json; };
-  qtquickcontrols = { version = "5.15.3"; json = ./qtquickcontrols.json; };
-  qtquickcontrols2 = { version = "5.15.3"; json = ./qtquickcontrols2.json; };
-  qtquicktimeline = { version = "5.15.3"; json = ./qtquicktimeline.json; };
-  qtremoteobjects = { version = "5.15.3"; json = ./qtremoteobjects.json; };
-  qtscript = { version = "5.15.4"; json = ./qtscript.json; };
-  qtscxml = { version = "5.15.3"; json = ./qtscxml.json; };
-  qtsensors = { version = "5.15.3"; json = ./qtsensors.json; };
-  qtserialbus = { version = "5.15.3"; json = ./qtserialbus.json; };
-  qtserialport = { version = "5.15.3"; json = ./qtserialport.json; };
-  qtspeech = { version = "5.15.3"; json = ./qtspeech.json; };
-  qtsvg = { version = "5.15.3"; json = ./qtsvg.json; };
-  qttools = { version = "5.15.3"; json = ./qttools.json; };
-  qttranslations = { version = "5.15.3"; json = ./qttranslations.json; };
-  qtvirtualkeyboard = { version = "5.15.3"; json = ./qtvirtualkeyboard.json; };
-  qtwayland = { version = "5.15.3"; json = ./qtwayland.json; };
-  qtwebchannel = { version = "5.15.3"; json = ./qtwebchannel.json; };
-  qtwebglplugin = { version = "5.15.3"; json = ./qtwebglplugin.json; };
-  qtwebsockets = { version = "5.15.3"; json = ./qtwebsockets.json; };
-  qtwebview = { version = "5.15.3"; json = ./qtwebview.json; };
-  qtwinextras = { version = "5.15.3"; json = ./qtwinextras.json; };
-  qtx11extras = { version = "5.15.3"; json = ./qtx11extras.json; };
-  qtxmlpatterns = { version = "5.15.3"; json = ./qtxmlpatterns.json; };
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
deleted file mode 100644
index 2beb42f0fe96..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qt3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qt3d.git",
-  "rev": "7edec6e014de27b9dd03f63875c471aac606a918",
-  "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
deleted file mode 100644
index 01e514ebb66d..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtactiveqt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
-  "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb",
-  "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
deleted file mode 100644
index 62ceb5aa8f98..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtandroidextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
-  "rev": "8cce1098c59534352aa0f343ea73861f603ac04a",
-  "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
deleted file mode 100644
index 37e249040f14..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtbase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtbase.git",
-  "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a",
-  "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
deleted file mode 100644
index 560489a6e217..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtcharts.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtcharts.git",
-  "rev": "130463160b4923069eb98da49edaf7d93180f4f8",
-  "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
deleted file mode 100644
index c606975bfe51..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtconnectivity.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
-  "rev": "69a87a9b831e36a578594a0a13130c384ad03121",
-  "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
deleted file mode 100644
index 278e3ec4df62..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdatavis3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
-  "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92",
-  "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
deleted file mode 100644
index 868c49c5a2ea..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdeclarative.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
-  "rev": "55324650f9e759a43dce927f823c9858574106c3",
-  "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
deleted file mode 100644
index c00f65fd10d3..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtdoc.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtdoc.git",
-  "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e",
-  "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
deleted file mode 100644
index f3cbee2dedc7..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtgamepad.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
-  "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81",
-  "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
deleted file mode 100644
index c78f288919f9..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtgraphicaleffects.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
-  "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e",
-  "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
deleted file mode 100644
index 28795710b1e9..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtimageformats.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
-  "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f",
-  "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
deleted file mode 100644
index 4ed826b65562..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtlocation.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtlocation.git",
-  "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f",
-  "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
deleted file mode 100644
index ed255997b77b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtlottie.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtlottie.git",
-  "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4",
-  "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
deleted file mode 100644
index 9aa1128ce26e..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtmacextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
-  "rev": "e72896968697e2a8af16a312e1560948e4c40f30",
-  "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
deleted file mode 100644
index 93b26b6734eb..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtmultimedia.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
-  "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545",
-  "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
deleted file mode 100644
index fa0c49185f52..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtnetworkauth.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
-  "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a",
-  "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
deleted file mode 100644
index 90c086794cbe..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtpurchasing.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
-  "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e",
-  "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
deleted file mode 100644
index 3cb8d7dcc809..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquick3d.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
-  "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3",
-  "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
deleted file mode 100644
index 6bd93cf62c32..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
-  "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420",
-  "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
deleted file mode 100644
index fcacda36609f..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquickcontrols2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
-  "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07",
-  "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
deleted file mode 100644
index 3a99df32920b..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtquicktimeline.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
-  "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07",
-  "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
deleted file mode 100644
index 5b1aefb8d40a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtremoteobjects.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
-  "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735",
-  "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
deleted file mode 100644
index 3aefd77854c5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtscript.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtscript.git",
-  "rev": "5cec94b2c1503f106f4ef4778d016410ebb86211",
-  "sha256": "1xdri98cw7m78k9kfb53cgh8wyz98q3i623jhhcv01rvy1zsf8m1",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
deleted file mode 100644
index b792b71119cf..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtscxml.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtscxml.git",
-  "rev": "7a15000f42c7a3171719727cd056f82a78244ed7",
-  "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
deleted file mode 100644
index 2d2e1c7ea689..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtsensors.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtsensors.git",
-  "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1",
-  "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
deleted file mode 100644
index cea79ff4c553..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialbus.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
-  "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32",
-  "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
deleted file mode 100644
index a4e09c149052..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtserialport.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtserialport.git",
-  "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4",
-  "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
deleted file mode 100644
index 317bafe92c16..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtspeech.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtspeech.git",
-  "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b",
-  "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
deleted file mode 100644
index 9e4d5b2ea870..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtsvg.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtsvg.git",
-  "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c",
-  "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
deleted file mode 100644
index 9045142a54ee..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qttools.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qttools.git",
-  "rev": "33693a928986006d79c1ee743733cde5966ac402",
-  "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json b/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
deleted file mode 100644
index 09e8ac32031a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qttranslations.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qttranslations.git",
-  "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638",
-  "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
deleted file mode 100644
index 76a20b6ca5d5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtvirtualkeyboard.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
-  "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5",
-  "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
deleted file mode 100644
index 25b267c66c1f..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwayland.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwayland.git",
-  "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee",
-  "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
deleted file mode 100644
index fa6ac0bd1b74..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebchannel.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
-  "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38",
-  "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
deleted file mode 100644
index 386a8aa143d2..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebglplugin.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
-  "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b",
-  "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
deleted file mode 100644
index 23c2c9ae5384..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebsockets.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
-  "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b",
-  "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
deleted file mode 100644
index 27a93a97da54..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwebview.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwebview.git",
-  "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f",
-  "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
deleted file mode 100644
index 30847e67e560..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtwinextras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
-  "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7",
-  "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
deleted file mode 100644
index 4c4d665e287a..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtx11extras.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
-  "rev": "3898f5484fd4864b047729bfeda9a1222f32364f",
-  "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json b/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
deleted file mode 100644
index 6363cb262967..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/srcs/qtxmlpatterns.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
-  "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c",
-  "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq",
-  "fetchLFS": false,
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}

From b9331fbad9226b825f46c2f52db4528eb4e4b897 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 10:59:30 -0500
Subject: [PATCH 06/10] qt515: consolidate extra package sources

---
 .../libraries/qt-5/5.15/default.nix           | 52 +------------------
 pkgs/development/libraries/qt-5/5.15/srcs.nix | 49 ++++++++++++++++-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1659dc51ae27..183311c5f18a 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -21,60 +21,12 @@ Check for any minor version changes.
 
 let
 
+  srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };
+
   qtCompatVersion = srcs.qtbase.version;
 
   stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
 
-  mirror = "https://download.qt.io";
-  srcs =
-    import ./srcs.nix { inherit lib fetchgit; }
-    // {
-      # qtwebkit does not have an official release tarball on the qt mirror and is
-      # mostly maintained by the community.
-      qtwebkit = rec {
-        src = fetchFromGitHub {
-          owner = "qt";
-          repo = "qtwebkit";
-          rev = "v${version}";
-          sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-        };
-        version = "5.212.0-alpha4";
-      };
-      qtwebengine =
-        let
-          branchName = "5.15.6";
-          rev = "v${branchName}-lts";
-        in
-        {
-          version = "${branchName}-${lib.substring 0 7 rev}";
-
-          src = fetchgit {
-            url = "https://github.com/qt/qtwebengine.git";
-            sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
-            inherit rev branchName;
-            fetchSubmodules = true;
-            leaveDotGit = true;
-            name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
-            postFetch = ''
-              # remove submodule .git directory
-              rm -rf "$out/src/3rdparty/.git"
-
-              # compress to not exceed the 2GB output limit
-              # try to make a deterministic tarball
-              tar -I 'gzip -n' \
-                --sort=name \
-                --mtime=1970-01-01 \
-                --owner=root --group=root \
-                --numeric-owner --mode=go=rX,u+rw,a-s \
-                --transform='s@^@source/@' \
-                -cf temp  -C "$out" .
-              rm -r "$out"
-              mv temp "$out"
-            '';
-          };
-        };
-    };
-
   patches = {
     qtbase = lib.optionals stdenv.isDarwin [
       ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 9527b8aa4071..e254912b6009 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit }:
+{ lib, fetchgit, fetchFromGitHub }:
 
 let
   version = "5.15.3";
@@ -23,3 +23,50 @@ let
     };
 in
 lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
+// {
+  # qtwebkit does not have an official release tarball on the qt mirror and is
+  # mostly maintained by the community.
+  qtwebkit = rec {
+    src = fetchFromGitHub {
+      owner = "qt";
+      repo = "qtwebkit";
+      rev = "v${version}";
+      sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
+    };
+    version = "5.212.0-alpha4";
+  };
+
+  qtwebengine =
+    let
+      branchName = "5.15.6";
+      rev = "v${branchName}-lts";
+    in
+    {
+      version = "${branchName}-${lib.substring 0 7 rev}";
+
+      src = fetchgit {
+        url = "https://github.com/qt/qtwebengine.git";
+        sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
+        inherit rev branchName;
+        fetchSubmodules = true;
+        leaveDotGit = true;
+        name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
+        postFetch = ''
+          # remove submodule .git directory
+          rm -rf "$out/src/3rdparty/.git"
+
+          # compress to not exceed the 2GB output limit
+          # try to make a deterministic tarball
+          tar -I 'gzip -n' \
+            --sort=name \
+            --mtime=1970-01-01 \
+            --owner=root --group=root \
+            --numeric-owner --mode=go=rX,u+rw,a-s \
+            --transform='s@^@source/@' \
+            -cf temp  -C "$out" .
+          rm -r "$out"
+          mv temp "$out"
+        '';
+      };
+    };
+}

From 940e66891492e03b8144c76cf68173335f779049 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:33:31 -0500
Subject: [PATCH 07/10] qt515: remove unused file

---
 .../libraries/qt-5/5.15/patches.nix           | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.15/patches.nix

diff --git a/pkgs/development/libraries/qt-5/5.15/patches.nix b/pkgs/development/libraries/qt-5/5.15/patches.nix
deleted file mode 100644
index e3a08769e8c5..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/patches.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-qt3d = {name="qt3d-5.15.patch";url="https://invent.kde.org/qt/qt/qt3d.git";fromRev="34171b1d99f55fde1627df3c57eed50480ab2ae7";toRev="7edec6e014de27b9dd03f63875c471aac606a918";sha256="12hrq0arwhfk8blqjrb24rcka9cy2asg0mpfck63khcmjhqyaic9";};
-qtactiveqt = {name="qtactiveqt-5.15.patch";url="https://invent.kde.org/qt/qt/qtactiveqt.git";fromRev="0c62d8262fb2a4779e05e95d112f08125031b640";toRev="f0d03da0e37a84029a4eae1733813521482ac1fb";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtandroidextras = {name="qtandroidextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtandroidextras.git";fromRev="505be55243ba1600f62f47f9be3011a717841096";toRev="8cce1098c59534352aa0f343ea73861f603ac04a";sha256="1zjinv99mh2w49nshprdssl1ybjb7av7m6i85pd2gc97shvn6g77";};
-qtbase = {name="qtbase-5.15.patch";url="https://invent.kde.org/qt/qt/qtbase.git";fromRev="40143c189b7c1bf3c2058b77d00ea5c4e3be8b28";toRev="c9fde86b0a2440133bc08f4811b6ca793be47f0a";sha256="0rax1ic031b14456sz3a5v2m3h6yarfv0nlfw27k41d43wrbbg1x";};
-qtcharts = {name="qtcharts-5.15.patch";url="https://invent.kde.org/qt/qt/qtcharts.git";fromRev="a67f812548b008e3eedcd2bb9313828a195fd23b";toRev="130463160b4923069eb98da49edaf7d93180f4f8";sha256="0va2ykp4lcni7xxlmpjqlwsjbal48sbwmx7kfswm7z0a9ps4py3d";};
-qtconnectivity = {name="qtconnectivity-5.15.patch";url="https://invent.kde.org/qt/qt/qtconnectivity.git";fromRev="ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea";toRev="69a87a9b831e36a578594a0a13130c384ad03121";sha256="1kjw83h66hfg2qbfcw5xnr1x5cicp2snmgz5wjqg45z5bkk517bs";};
-qtdatavis3d = {name="qtdatavis3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtdatavis3d.git";fromRev="1168c788a117e4556e6cd0ba1e267a86ef62b0c4";toRev="c085311c02dd216e5a041b90c164d55b3cf3ce92";sha256="16vzmdcfd8r4h7k28b7k48nlzn4smzf0903qjfy565ydpmwnhm07";};
-qtdeclarative = {name="qtdeclarative-5.15.patch";url="https://invent.kde.org/qt/qt/qtdeclarative.git";fromRev="104eae5b17b0ec700391e9539ee3a4f638588194";toRev="55324650f9e759a43dce927f823c9858574106c3";sha256="0jb0bcg4r8sry3dcx5am9w4qcn1zx1a30lwyr3wxry11m81lsbd0";};
-qtdoc = {name="qtdoc-5.15.patch";url="https://invent.kde.org/qt/qt/qtdoc.git";fromRev="2d00e0060b2894481c8f46577ac995aeda4a7641";toRev="897e90fe304d844beaf694b82a93a50237fa8b9e";sha256="0qfvcy6lj7fb3fazg6q6j05qdank6ba5najz3sw4m7r6dybf8nwl";};
-qtgamepad = {name="qtgamepad-5.15.patch";url="https://invent.kde.org/qt/qt/qtgamepad.git";fromRev="ff933a4e72826a77c81c4153f1adcf765ead35f0";toRev="64afa18a0a1e9588060e2e6d917bb01ccdd48a81";sha256="1gcas9mxs409rzsmmi40gf16vcy4kv17hd1sf1h7k315inixyppk";};
-qtgraphicaleffects = {name="qtgraphicaleffects-5.15.patch";url="https://invent.kde.org/qt/qt/qtgraphicaleffects.git";fromRev="66b7fbaca4b323dce337e87e3093c8836577c561";toRev="c36998dc1581167b12cc3de8e4ac68c2a5d9f76e";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtimageformats = {name="qtimageformats-5.15.patch";url="https://invent.kde.org/qt/qt/qtimageformats.git";fromRev="74a5bc4a45195b876454e596e76cb23aeb365410";toRev="cb82c74310837fe4e832c8ab72176a5d63e4355f";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtlocation = {name="qtlocation-5.15.patch";url="https://invent.kde.org/qt/qt/qtlocation.git";fromRev="02a21217a9706402802f38c646797be8eccb86e4";toRev="861e372b6ad81570d4f496e42fb25a6699b72f2f";sha256="144bz04071dcdhqi0z1yzpsbkzj634vdig11hv3y6ykh3400x606";};
-qtlottie = {name="qtlottie-5.15.patch";url="https://invent.kde.org/qt/qt/qtlottie.git";fromRev="b182dcd78a35b4667b2568857b7719d555c7fddb";toRev="fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
-qtmacextras = {name="qtmacextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtmacextras.git";fromRev="65f500c488c593486c6c390f53497dfbce1b58a6";toRev="e72896968697e2a8af16a312e1560948e4c40f30";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtmultimedia = {name="qtmultimedia-5.15.patch";url="https://invent.kde.org/qt/qt/qtmultimedia.git";fromRev="fd30913d4601d12437404e1d20113a1ed6364ccc";toRev="bd29c87027637a013f2c5e3b549fcda84e4d7545";sha256="15kvask4kabpnmwpyc1rbr8ybhnmzdycznb5r72n4f4scznzjmi8";};
-qtnetworkauth = {name="qtnetworkauth-5.15.patch";url="https://invent.kde.org/qt/qt/qtnetworkauth.git";fromRev="fb2d6d47a0c961278d63309789a1141c3734818b";toRev="53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a";sha256="0s6p3gs8mrc824699wrbazkfl169midmnyzvp4cnml8grfl89azj";};
-qtpurchasing = {name="qtpurchasing-5.15.patch";url="https://invent.kde.org/qt/qt/qtpurchasing.git";fromRev="ddfa4d16243128d2871a51c513e025d518151b17";toRev="cbf444fb570ca4f4ca21d963d2ae4010f10d473e";sha256="0z1dax7g5p1dza5d96aayvi9chzmkrl6s3yfr3xn7jhxwf0r51fp";};
-qtquick3d = {name="qtquick3d-5.15.patch";url="https://invent.kde.org/qt/qt/qtquick3d.git";fromRev="2e05e6d6546635a8f25882c5140fb17697be0062";toRev="3e3e53c834b25dc2959dd30f319d12d6f84ee1e3";sha256="0kckgix393qqcpz5wlpvpkfmrj921bvnjzp13ka7dn1ys5rzac4z";};
-qtquickcontrols = {name="qtquickcontrols-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols.git";fromRev="7c29283041a50def3ceca7de4471f211c9b30d4e";toRev="cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420";sha256="0843jcggynzgv3ymvnkhgvfs44z56bmg7n2gl8f75nziwn5yi840";};
-qtquickcontrols2 = {name="qtquickcontrols2-5.15.patch";url="https://invent.kde.org/qt/qt/qtquickcontrols2.git";fromRev="16f27dfa3588c2bf377568ce00bf534af48c9558";toRev="be66bf9a5618c745d2a6ee2262967af6307b3b07";sha256="1jjbvp9cwdxqy8lm1jm9b20w1jxl4f15sn2m0sz38bnch5n3s3kv";};
-qtquicktimeline = {name="qtquicktimeline-5.15.patch";url="https://invent.kde.org/qt/qt/qtquicktimeline.git";fromRev="147ad75c589fc4804429710fdb177cc48a80dbea";toRev="67503cdadea43b95ddad0de1a04951aff0ce1a07";sha256="0c2cdvb2l488qzpaymfl1yik21iydqrdqjf95cdjif6pnb42xwxi";};
-qtremoteobjects = {name="qtremoteobjects-5.15.patch";url="https://invent.kde.org/qt/qt/qtremoteobjects.git";fromRev="8e889442508e284691c923470eb4552c96afdfe3";toRev="4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735";sha256="11f65d8bfkj7k9jfq780hki9kwndwgvnj355w4xbfs0icm4l7ggn";};
-qtscript = {name="qtscript-5.15.patch";url="https://invent.kde.org/qt/qt/qtscript.git";fromRev="5da7de1800eee3d604eb7e787b114479b61ffc93";toRev="5cec94b2c1503f106f4ef4778d016410ebb86211";sha256="0nndn6aia39m9zfydg471fxiyjwfayvygzh600aqnl2h8d912n1x";};
-qtscxml = {name="qtscxml-5.15.patch";url="https://invent.kde.org/qt/qt/qtscxml.git";fromRev="95aa78be795a862b95371afa75e1417029ec0a16";toRev="7a15000f42c7a3171719727cd056f82a78244ed7";sha256="0b7xqd5lpkjsgivi58g7f09i9rv1dpl1b4wrfgbxlff2scfy0vjh";};
-qtsensors = {name="qtsensors-5.15.patch";url="https://invent.kde.org/qt/qt/qtsensors.git";fromRev="5618198e6df5e0224f79f786a44af7527b431545";toRev="921a31375f29e429e95352b08b2b9dbfea663cb1";sha256="1xjdw99fvnp4pb9qgj32rpj3zfh6nkb8k4ax9c8z1yk04ra0rq3n";};
-qtserialbus = {name="qtserialbus-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialbus.git";fromRev="1aa9b03756baead139943712839af5ecedeb2989";toRev="8884c5e43df846deac5a0c7c290eeb633d6bfe32";sha256="05dl7xkxwxs42shrykpq8jz9a8b9l60anp965cv4qb19zglwvcfm";};
-qtserialport = {name="qtserialport-5.15.patch";url="https://invent.kde.org/qt/qt/qtserialport.git";fromRev="192e376b01e65e7277772bdc94106613c22cf531";toRev="941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4";sha256="0cmqjd3xlspkl9xp5m8d7cf16w4503jnjpr5wnm3n45x1a7qypsj";};
-qtspeech = {name="qtspeech-5.15.patch";url="https://invent.kde.org/qt/qt/qtspeech.git";fromRev="84dd22a080014cb99a7dff7772990787a04ca533";toRev="a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b";sha256="1vspazk7lh6idwnmh935fhjxa2f8yp3h7vyb3chli99ygh0386vx";};
-qtsvg = {name="qtsvg-5.15.patch";url="https://invent.kde.org/qt/qt/qtsvg.git";fromRev="52d3788c7b0116ea3db232dccca5f1e3f1e229ac";toRev="24128cdf8bef53eddf31a5709bbbc46293006b1c";sha256="018a1w6k7911ydim7h2z8mg1dqrfvllr874jqr9kylp2ymq95hhv";};
-qttools = {name="qttools-5.15.patch";url="https://invent.kde.org/qt/qt/qttools.git";fromRev="cc52debd905e0ed061290d6fd00a5f1ab67478a5";toRev="33693a928986006d79c1ee743733cde5966ac402";sha256="0hwpr3qalzn9hljakicpdwqd66mxghzqhi4896kscqy41db3mym3";};
-qttranslations = {name="qttranslations-5.15.patch";url="https://invent.kde.org/qt/qt/qttranslations.git";fromRev="cb1857418b36780b0444333f3aa6250ca3780f19";toRev="8fbbdf21f127197f97b58c7d80d2fa2a59135638";sha256="0p47ima4dn8sjhhg6c0qr0jip0q4akvi5xm2wxj62dlzr8d0zv14";};
-qtvirtualkeyboard = {name="qtvirtualkeyboard-5.15.patch";url="https://invent.kde.org/qt/qt/qtvirtualkeyboard.git";fromRev="7b90415c58dd02c682a9ba317f273d7b3398ff88";toRev="353b75b2e34bdae901625bbddf5c5e3f3e6c0de5";sha256="19azki7yi83dkc05asclrkj0lf14x927l30xpg5lj2p2mz1cf1mr";};
-qtwayland = {name="qtwayland-5.15.patch";url="https://invent.kde.org/qt/qt/qtwayland.git";fromRev="3cc17177b1b03053276eb6236fda137c588261a7";toRev="992833ca741efe8f533c61abfaf129a1d8bfcfee";sha256="072zp6fksjig1y1cw4jm7wv60qd9hdci7cx1hxhfw1r4c7k012wp";};
-qtwebchannel = {name="qtwebchannel-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebchannel.git";fromRev="90cffd49575b075b0dc28440c693753d860fee87";toRev="47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38";sha256="0irxngxg23kwf7zmbr5k5lzqfbyf1zh5smjkpl3dvx444qqxgrdl";};
-qtwebglplugin = {name="qtwebglplugin-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebglplugin.git";fromRev="5e41e564aaf96b7e49403af5099995efbe4cac8e";toRev="550a8cee241bbf8c11863dec9587d579dcb1108b";sha256="12iv161qmapakrb4awkpqzwq4r366fbgm344p0b3zsw7jzkqigw8";};
-qtwebsockets = {name="qtwebsockets-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebsockets.git";fromRev="f73735911b2124ef16aa39228bf8f89ee900ba5d";toRev="e7883bc64440b1ff4666272ac6eb710ee4bc221b";sha256="0sjg8m2sd6rlg5asjb6ddh8rd6c0pp7l1532al1br00b861al5yi";};
-qtwebview = {name="qtwebview-5.15.patch";url="https://invent.kde.org/qt/qt/qtwebview.git";fromRev="800926cc4e0ecfdb37a3b34486403354b66a37a4";toRev="920de5f1cd9f9001cfef1bfd2c19e6720793362f";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtwinextras = {name="qtwinextras-5.15.patch";url="https://invent.kde.org/qt/qt/qtwinextras.git";fromRev="41f2492a30be21f28c8b0b7b932b886536fc9916";toRev="3df03dab21f3e84d5a7274c64dd879854ca1bfe7";sha256="10bqq6msnryqr8ald4hlhga4f6qhmrkl6ygwpnkqgyq577n4jz0p";};
-qtx11extras = {name="qtx11extras-5.15.patch";url="https://invent.kde.org/qt/qt/qtx11extras.git";fromRev="9bb0adeac84da6723cf57a2bb0d0c3b405691a15";toRev="3898f5484fd4864b047729bfeda9a1222f32364f";sha256="0al27mckfgfcrqvf0x3didaina2rj4xi3hp6vdpz5i6p3z4ws8wq";};
-qtxmlpatterns = {name="qtxmlpatterns-5.15.patch";url="https://invent.kde.org/qt/qt/qtxmlpatterns.git";fromRev="50421402f05b3ee3c76c6cff455a69efaf576b6d";toRev="189e28d0aff1f3d7960228ba318b83e3cadac98c";sha256="0hxsxk6l4x8h6q053lm65wxkl3di3qx9z8rjn0w1nxs051q1szch";};
-}

From de97acd19010c1b47b6b427e955555f5b24133e0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:37:54 -0500
Subject: [PATCH 08/10] qt515: consolidate bash set short options

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/qt-5/5.15/fetch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh
index e97dee310d07..dcada3649078 100755
--- a/pkgs/development/libraries/qt-5/5.15/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p nix-prefetch-scripts jq
 
-set -x -e -o pipefail
+set -eox pipefail
 
 here="$(dirname "${BASH_SOURCE[0]}")"
 modules="${here}/modules"

From 27b6cf2445196ed10fbe06c2c9f64331ac0ac291 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:38:56 -0500
Subject: [PATCH 09/10] qtModule: combine conditionals inside evaluation
 brackets

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/qt-5/qtModule.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 245d94f909d2..12a9a85c7b79 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -45,7 +45,7 @@ mkDerivation (args // {
       exit 1
     fi
 
-    if [[ -z "$dontSyncQt" ]] && [[ -f sync.profile ]]; then
+    if [[ -z "$dontSyncQt" && -f sync.profile ]]; then
       syncqt.pl -version "''${version%%-*}"
     fi
   '';

From 5b22f14d3818c7e20d349f2f399bf85d063413a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 11:58:38 -0500
Subject: [PATCH 10/10] qtbase: avoid rebuilding versions < 5.15

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 53c55863f6f3..44f08699824f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation {
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake
     sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in
     sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-
+  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
     patchShebangs ./bin
   '' + (
     if stdenv.isDarwin then ''
@@ -151,10 +151,8 @@ stdenv.mkDerivation {
     ''}
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
-
-    ${lib.optionalString (compareVersion "5.15.0" >= 0) ''
+  '' + lib.optionalString (compareVersion "5.15.0" >= 0) ''
     ./bin/syncqt.pl -version $version
-    ''}
   '';
 
   postConfigure = ''