From 8f8f8f276883af0af12492d7045198c1d9de0520 Mon Sep 17 00:00:00 2001
From: Egor Savkin <es@m-labs.hk>
Date: Fri, 17 May 2024 15:31:02 +0800
Subject: [PATCH] Update base installer and move to clang64

Signed-off-by: Egor Savkin <es@m-labs.hk>
---
 flake.nix                                     |  36 +-
 installer/qt-ifw/config/config.xml            |   2 +-
 .../com.msys2.root/meta/installscript.js      |   2 +-
 msys2/PKGBUILD.common                         |  16 +-
 msys2/artiq_dependencies.txt                  |  38 +-
 msys2/artiq_dependency_packages.nix           | 606 +++++++++---------
 msys2/comtools_dependencies.txt               |   6 +-
 msys2/default.nix                             |   8 +-
 msys2/make_msys2_packages.sh                  |   6 +-
 msys2/msys2_packages.nix                      | 222 +++----
 msys2/msys2_qt_ifw_packages.nix               |   6 +-
 msys2/pythonparser_dependencies.txt           |   2 +-
 msys2/sipyco_dependencies.txt                 |   6 +-
 13 files changed, 484 insertions(+), 472 deletions(-)

diff --git a/flake.nix b/flake.nix
index d952a6d..9ca79cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -439,7 +439,7 @@
           name = "artiq-comtools";
           src = artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools.src;
           inherit (artiqpkgs.inputs.artiq-comtools.packages.x86_64-linux.artiq-comtools) version;
-          depends = (readStringListFromFile comtoolsDependenciesFile) ++ [ "mingw-w64-x86_64-python-sipyco" ];
+          depends = (readStringListFromFile comtoolsDependenciesFile) ++ [ "mingw-w64-clang-x86_64-python-sipyco" ];
         };
         msys2-artiq = msys2.makeMsys2Package {
           name = "artiq";
@@ -450,56 +450,56 @@
               export VERSIONEER_REV=${artiqpkgs.sourceInfo.rev}
               '';
           depends = (readStringListFromFile artiqDependenciesFile)
-            ++ [ "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-pythonparser" "mingw-w64-x86_64-artiq-comtools" ];
+            ++ [ "mingw-w64-clang-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-pythonparser" "mingw-w64-clang-x86_64-artiq-comtools" ];
 
         };
         msys2-asyncserial = msys2.makeMsys2Package {
           name = "python-asyncserial";
           version = artiqpkgs.packages.x86_64-linux.asyncserial.version;
           src = artiqpkgs.packages.x86_64-linux.asyncserial.src;
-          depends = [ "mingw-w64-x86_64-python" ];
+          depends = [ "mingw-w64-clang-x86_64-python" ];
         };
         msys2-korad_ka3005p = msys2.makeMsys2Package {
           name = "korad_ka3005p";
           version = korad_ka3005p.version;
           src = korad_ka3005p.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-asyncserial" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-asyncserial" ];
         };
         msys2-novatech409b = msys2.makeMsys2Package {
           name = "novatech409b";
           version = novatech409b.version;
           src = novatech409b.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-asyncserial" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-asyncserial" ];
         };
         msys2-lda = msys2.makeMsys2Package {
           name = "lda";
           version = lda.version;
           src = lda.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" ];
         };
         msys2-thorlabs_tcube = msys2.makeMsys2Package {
           name = "thorlabs_tcube";
           version = thorlabs_tcube.version;
           src = thorlabs_tcube.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" "mingw-w64-x86_64-python-asyncserial" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-asyncserial" ];
         };
         msys2-newfocus8742 = msys2.makeMsys2Package {
           name = "newfocus8742";
           version = newfocus8742.version;
           src = newfocus8742.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" ];
         };
         msys2-hut2 = msys2.makeMsys2Package {
           name = "hut2";
           version = hut2.version;
           src = hut2.src;
-          depends = [ "mingw-w64-x86_64-python-sipyco" ];
+          depends = [ "mingw-w64-clang-x86_64-python-sipyco" ];
         };
         msys2-flake8-artiq = msys2.makeMsys2Package {
           name = "flake8-artiq";
           version = flake8-artiq.version;
           src = flake8-artiq.src;
-          depends = [ "mingw-w64-x86_64-python-flake8" ];
+          depends = [ "mingw-w64-clang-x86_64-python-flake8" ];
         };
         msys2-repos = msys2.makeMsys2Repos [
           msys2-pythonparser msys2-sipyco msys2-artiq-comtools msys2-artiq
@@ -530,9 +530,9 @@
             artiq-deps-pkgs = import ./msys2/artiq_dependency_packages.nix { inherit pkgs; };
             msys2-pkgs = import ./msys2/msys2_packages.nix { inherit pkgs; };
             msys2-base = pkgs.fetchurl {
-              url = "https://github.com/msys2/msys2-installer/releases/download/2024-01-13/msys2-base-x86_64-20240113.tar.xz";
+              url = "https://github.com/msys2/msys2-installer/releases/download/2024-05-07/msys2-base-x86_64-20240507.tar.xz";
               name = "base";
-              sha256 = "sha256-BEVqRKlW08C1+bbHVJGL86jD2HyFi+egyUyRcasTxYw=";
+              sha256 = "sha256-RiXJqvmFDaItr6KgoWTekUPHue4i/LM4uBqfVx9HKpc=";
             };
 
             src = ./.;
@@ -545,14 +545,14 @@
                tar -xvf ${msys2-base} --strip-components=1 -C $out/ msys64
                printf "\n[artiq]\nSigLevel = Optional TrustAll\nServer = https://msys2.m-labs.hk/artiq-beta\n" >> $out/etc/pacman.conf
                cat $out/etc/pacman.conf | sed -e "s|/etc/pacman.d|$out/etc/pacman.d|g" -e "s|SigLevel    = Required|SigLevel    = Never|g" -e "s|CheckSpace||g" > tmp/pacman.conf
-               sed -i '/\[mingw32\]/,/^$/d; /\[clang32\]/,/^$/d; /\[clang64\]/,/^$/d; /\[ucrt64\]/,/^$/d;  /\[clangarm64\]/,/^$/d;' $out/etc/pacman.conf
+               sed -i '/\[mingw32\]/,/^$/d; /\[clang32\]/,/^$/d; /\[mingw64\]/,/^$/d; /\[ucrt64\]/,/^$/d;  /\[clangarm64\]/,/^$/d;' $out/etc/pacman.conf
                fakeroot pacman -U --asdeps --noconfirm  --cachedir tmp/cache --config  tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") msys2-pkgs)}
                fakeroot pacman -U --asdeps --noconfirm  --cachedir tmp/cache --config  tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") artiq-deps-pkgs)}
                fakeroot pacman -U --noconfirm  --cachedir tmp/cache --config  tmp/pacman.conf --root $out ${msys2-artiq}/*.pkg.tar.zst ${msys2-artiq-comtools}/*.pkg.tar.zst ${msys2-pythonparser}/*.pkg.tar.zst ${msys2-sipyco}/*.pkg.tar.zst
-               rm -rf $out/clang64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \
-                  $out/var/lib/pacman/sync/clang64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \
+               rm -rf $out/mingw64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \
+                  $out/var/lib/pacman/sync/mingw64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \
                   $out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \
-                  $out/etc/pacman.d/mirrorlist.clang64 $out/etc/pacman.d/mirrorlist.clang32 $out/etc/pacman.d/mirrorlist.clangarm64 \
+                  $out/etc/pacman.d/mirrorlist.mingw64 $out/etc/pacman.d/mirrorlist.clang32 $out/etc/pacman.d/mirrorlist.clangarm64 \
                   $out/etc/pacman.d/mirrorlist.mingw32 $out/etc/pacman.d/mirrorlist.ucrt64
            '';
           };
@@ -567,8 +567,8 @@
              sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ;
 
              7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"*
-             ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/mingw64/bin/binarycreator.exe \
-                   -t "$msys2_qt_ifw/mingw64/bin/installerbase.exe" \
+             ${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \
+                   -t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \
                    -p "qt-ifw/packages" \
                    -c "qt-ifw/config/config.xml" \
                    --offline-only \
diff --git a/installer/qt-ifw/config/config.xml b/installer/qt-ifw/config/config.xml
index c05eefc..5382497 100644
--- a/installer/qt-ifw/config/config.xml
+++ b/installer/qt-ifw/config/config.xml
@@ -6,7 +6,7 @@
     <Publisher>M-Labs Ltd.</Publisher>
     <ControlScript>control.js</ControlScript>
     <StartMenuDir>MSYS2 with ARTIQ</StartMenuDir>
-    <RunProgram>@TargetDir@/mingw64.exe</RunProgram>
+    <RunProgram>@TargetDir@/clang64.exe</RunProgram>
     <RunProgramArguments></RunProgramArguments>
     <InstallerApplicationIcon>artiq</InstallerApplicationIcon>
     <InstallerWindowIcon>artiq.ico</InstallerWindowIcon>
diff --git a/installer/qt-ifw/packages/com.msys2.root/meta/installscript.js b/installer/qt-ifw/packages/com.msys2.root/meta/installscript.js
index 29308d6..2ab0388 100644
--- a/installer/qt-ifw/packages/com.msys2.root/meta/installscript.js
+++ b/installer/qt-ifw/packages/com.msys2.root/meta/installscript.js
@@ -34,7 +34,7 @@ function createShortcuts()
         return;
     }
 
-    component.addOperation("CreateShortcut", "@TargetDir@/mingw64.exe", "@StartMenuDir@/MSYS2 with ARTIQ.lnk", "iconPath=@TargetDir@/mingw64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 with ARTIQ.lnk", "iconPath=@TargetDir@/clang64.exe");
 
     component.addOperation( "Execute",
                            ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);
diff --git a/msys2/PKGBUILD.common b/msys2/PKGBUILD.common
index e4cea56..9768adb 100644
--- a/msys2/PKGBUILD.common
+++ b/msys2/PKGBUILD.common
@@ -1,32 +1,32 @@
 arch=("any")
-mingw_arch=("mingw64")
+mingw_arch=("clang64")
 pkgver=${DRV_VERSION}
 url="https://m-labs.hk"
 source=("source.tar")
 sha256sums=("SKIP")
 
 build() {
-  mkdir mingw64
-  export PYTHONPATH=`pwd`/mingw64/lib/python3.11/site-packages
+  mkdir clang64
+  export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages
   chmod +w -R source
   cd source
-  wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../mingw64 --record=setuptools-sucks.txt
+  wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt
   cd ..
 
   # setuptools creates this file if it doesn't already exist, which causes conflicts between pacman packages
   # see: https://corte.si/posts/code/setuptoolssucks/
-  rm -f mingw64/lib/python3.11/site-packages/easy-install.pth
+  rm -f clang64/lib/python3.11/site-packages/easy-install.pth
   # patch broken shebangs (Z:/nix/store/...)
-  for entrypoint in mingw64/bin/*-script.py; do
+  for entrypoint in clang64/bin/*-script.py; do
     [ -f "$entrypoint" ] || continue
     sed -i "1s|#!.*|#!python|" $entrypoint
   done
-  for entrypoint in mingw64/bin/*-script.pyw; do
+  for entrypoint in clang64/bin/*-script.pyw; do
     [ -f "$entrypoint" ] || continue
     sed -i "1s|#!.*|#!pythonw|" $entrypoint
   done
 }
 
 package() {
-  cp -R mingw64 ${pkgdir}
+  cp -R clang64 ${pkgdir}
 }
diff --git a/msys2/artiq_dependencies.txt b/msys2/artiq_dependencies.txt
index 89b54dd..c14341d 100644
--- a/msys2/artiq_dependencies.txt
+++ b/msys2/artiq_dependencies.txt
@@ -1,19 +1,19 @@
-mingw-w64-x86_64-python3.11
-mingw-w64-x86_64-python-h5py
-mingw-w64-x86_64-python-pyqt5
-mingw-w64-x86_64-qt5-svg
-mingw-w64-x86_64-python-qasync
-mingw-w64-x86_64-python-pyqtgraph
-mingw-w64-x86_64-python-numpy
-mingw-w64-x86_64-python-scipy
-mingw-w64-x86_64-python-dateutil
-mingw-w64-x86_64-python-prettytable
-mingw-w64-x86_64-python-tqdm
-mingw-w64-x86_64-python-pygit2
-mingw-w64-x86_64-python-llvmlite
-mingw-w64-x86_64-python-levenshtein
-mingw-w64-x86_64-python-lmdb
-mingw-w64-x86_64-lld
-mingw-w64-x86_64-llvm
-mingw-w64-x86_64-openocd
-mingw-w64-x86_64-bscan-spi-bitstreams
+mingw-w64-clang-x86_64-python3.11
+mingw-w64-clang-x86_64-python-h5py
+mingw-w64-clang-x86_64-python-pyqt5
+mingw-w64-clang-x86_64-qt5-svg
+mingw-w64-clang-x86_64-python-qasync
+mingw-w64-clang-x86_64-python-pyqtgraph
+mingw-w64-clang-x86_64-python-numpy
+mingw-w64-clang-x86_64-python-scipy
+mingw-w64-clang-x86_64-python-dateutil
+mingw-w64-clang-x86_64-python-prettytable
+mingw-w64-clang-x86_64-python-tqdm
+mingw-w64-clang-x86_64-python-pygit2
+mingw-w64-clang-x86_64-python-llvmlite
+mingw-w64-clang-x86_64-python-levenshtein
+mingw-w64-clang-x86_64-python-lmdb
+mingw-w64-clang-x86_64-lld
+mingw-w64-clang-x86_64-llvm
+mingw-w64-clang-x86_64-openocd
+mingw-w64-clang-x86_64-bscan-spi-bitstreams
diff --git a/msys2/artiq_dependency_packages.nix b/msys2/artiq_dependency_packages.nix
index a28c06e..e94d767 100644
--- a/msys2/artiq_dependency_packages.nix
+++ b/msys2/artiq_dependency_packages.nix
@@ -1,602 +1,608 @@
 { pkgs } : [
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r731.g8fdf7c9b5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libwinpthread-git";
-      sha256 = "1q5mjrsxxrqa0vm9vn1hqr0ijn7b24lkyzyx5hymlksdbx3r0b29";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libunwind";
+      sha256 = "16k6kng1z1cxlw6al5g17zwm1dd1myildzk9n30qr2ljygrc5ncl";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-6-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gcc-libs";
-      sha256 = "1wg64p13ldw3f9cl2na4dz8avj06a8xj9fdk9z6h2h2gp1ipgici";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libc++";
+      sha256 = "0zdgdzck0qyyc5vqg3i5d1rpsbzf0fl15bvwqzs3wqr01z7q35dm";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-expat";
-      sha256 = "13zp12yp286i8pbyqcvgdzln0c6r8hs9jfbwvrbbimhq57jcy91q";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-expat";
+      sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-bzip2";
-      sha256 = "1dki26kz4pmr9q3gp3dirrvrwkcv38b9sjrb9slrq4yw31ycjgk5";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-bzip2";
+      sha256 = "1n8zf2kk1xj7wiszp6mjchy1yzpalddbj0cj17qm625ags2vzflm";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.6-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libffi";
-      sha256 = "018sv8b54ym24qmyc61sxhjix3rrbmvj04plhy5i0k92qnk2hnv4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libffi-3.4.6-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libffi";
+      sha256 = "1q6gms980985bp087rnnpvz2fwfakgm5266izfk3b1mbp620s1yv";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpdecimal-4.0.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-mpdecimal";
-      sha256 = "1dm8hjj0l1q48fv0li0x5xn8yfy6a6ywicqm0i8v0c13qfa5hv7v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-mpdecimal-4.0.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-mpdecimal";
+      sha256 = "0hrhbjgi0g3jqpw8himshqw6vazm5sxhsfmyg386nbrxwnfgl1gb";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-4-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libiconv";
-      sha256 = "0mvamv1maj479lch0spfa25i27yfsb2795v1kpv6z3py8rmv7vff";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libiconv-1.17-4-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libiconv";
+      sha256 = "1g2bkhgf60dywccxw911ydyigf3m25yqfh81m5099swr7mjsmzyf";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-runtime-0.22.5-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gettext-runtime";
-      sha256 = "0kdjkscdgaxgb073a1ga07g5p53vh3cn6aaa9q96shsb7fbd3aqz";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-gettext-runtime-0.22.5-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-gettext-runtime";
+      sha256 = "0ll6ci6d3mc7g04q0xixjc209bh8r874dqbczgns69jsad3wg6mi";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libtre-git";
-      sha256 = "1fphiijfdz1zn3j11fq16fvqx88vms78d2rawsgrqd5janbq4flb";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libtre-git";
+      sha256 = "0fc9hxsdks1xy5fv0rcna433hlzf6jhs77hg0hfzkzhn06f9alp4";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libsystre";
-      sha256 = "0q67s9p1dcfzhhr1qsji7g3fpwsi223b5s1c4d74sczn3kvkrd6v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libsystre";
+      sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-ncurses";
-      sha256 = "00sx48qazh5nh70fyi9nd8l6498b97fmy9p6vmbsr3pjbwkwpznk";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-ncurses";
+      sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.3.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-openssl";
-      sha256 = "14p37hlj3vn0jb6grfwycjvlfakjbbj3h2fqw1xcj4al0dby2xsd";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-openssl";
+      sha256 = "0r9hvrvs1mywa1ilw2jd8z6dp7n7rgqc5qixcgagpn37b1vmvl4s";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-7-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-termcap";
-      sha256 = "1s51i2fwy1mrzmxsgr1vv87wlmb3bk88yipqalfldvy3xdgjgjh4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-termcap-1.3.1-7-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-termcap";
+      sha256 = "17ha468qavwin800cc3b7c3xdggwk2gakasfxg7jdx7616d99l0n";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-readline";
-      sha256 = "1qcgv32jrgs9fycqg5qyq40rkxxvjf7j6dnkprhf8zlnzhl3ymaa";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-readline";
+      sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.3.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-zlib";
-      sha256 = "1w05h62i4bcvkr09lzf442dx4ybf80w31m82clhxw59ysypwl16a";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-zlib-1.3.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-zlib";
+      sha256 = "06i9xjsskf4ddb2ph4h31md5c7imj9mzjhd4lc4q44j8dmpc1w5p";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.13-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tcl";
-      sha256 = "1h6sgjmqp2akm4nc64cmj87zr8iaa9m4wg1rgqhhs3x8a904m6by";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tcl-8.6.13-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tcl";
+      sha256 = "0paaqwk0sfy2zxwlxkmxf2bqq46lyg0sx7cqgzknvazwx8xa2z4x";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.45.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-sqlite3";
-      sha256 = "1rzjzhhji3wmggccv8av5gcqxl3d0wdyrfaj3g8v4gfqql9f525y";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.45.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-sqlite3";
+      sha256 = "1icvw3f08cgi94p0177i46v72wgpsxw95p6kd0sm2w3vj0qlqbcw";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.13-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tk";
-      sha256 = "093j1hkjs60nimbnad7jc7190pr2xrwx4nrz22g159dq770cc4xp";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tk-8.6.13-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tk";
+      sha256 = "12f6lqx1sglczcnz2ns6sxw9cxwm1klxajqzcrbnfwln1nllz2nd";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.6.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-xz";
-      sha256 = "089v96imr9fyg38v6hmpacd997dxz9c37fkqq4y03gcc4skj7078";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.1-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-xz";
+      sha256 = "12wj7015dy3gafvnf95bww60nkk35lwzzg9p6114qv1jr6q6hbdh";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tzdata-2024a-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tzdata";
-      sha256 = "1yjcndq1bhfy5mw04c8k5rbmknrcgkq023b0gvwra15spj2c1h9v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tzdata";
+      sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.11.9-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python";
-      sha256 = "1iv0pg26g8p7sqpjqzh0xdx6s9wi8l70kqkansky96nbqx2byp3f";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python";
+      sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.2.0-6-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gcc-libgfortran";
-      sha256 = "1jmncy2drswx441dhxxs4i471d5lyqdn7faxd6qdni0g6vd56qir";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-11.0.0.r744.ge5ac8c550-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libwinpthread-git";
+      sha256 = "1r320i80r7ga00j4kvq39gf9xpyylyhdfaspjgjsnan3hjlr6d2w";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-openblas";
-      sha256 = "1130ir15sq54mnhyr50yljkm1jj5s40lqkdhsmvk7rwlykl67jq4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm-openmp";
+      sha256 = "1jkvghfra2gm973sk5m407f3lp55gp7c1ss97g52qsj144vpgf0i";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-numpy";
-      sha256 = "1mhsnh3gvqhlq4m1m21xsfdf4zb0yrzvfp88hqcy6s1iiy5w4ync";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-openblas";
+      sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libaec-1.1.3-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libaec";
-      sha256 = "0ca6713y39flq6i4lsw7ja423s5zm7qcgxzzk1899v0n806fax9p";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-numpy";
+      sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-c-ares-1.28.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-c-ares";
-      sha256 = "0skdb9hcgzgrqf8n9x3pxihnbxfgi7gk8v8zjxvxpxr2pb2l57gr";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libaec-1.1.3-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libaec";
+      sha256 = "1x0w1mr000j08hqh9l7fwwm0vwlb9jpjr1jkfw67w3c3lixxl6pg";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-brotli-1.1.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-brotli";
-      sha256 = "1ix63yg59k6wq32xgs64i3i2hqsi9f5qj5qw5apsfr1sgy9zlppm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.28.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-c-ares";
+      sha256 = "1w61khmpx2wky1hqg9xhlywafjy51i8x6wvgyin6n011sby0pwgz";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libunistring-1.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libunistring";
-      sha256 = "17mhzkkvpaxgk5yy67kh20nqdfc7s959hw3ifmn8bjck5f7cs7k9";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-brotli";
+      sha256 = "113mha41q53cx0hw13cq1xdf7zbsd58sh8cl1cd7xzg1q69n60w2";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libidn2-2.3.7-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libidn2";
-      sha256 = "0ki6lnjid60qqs322qsljf7swa372czqbpyax6rc2yww5w53z8h9";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunistring-1.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libunistring";
+      sha256 = "13nz49li39z1zgfx1q9jg4vrmyrmqb6qdq0nqshidaqc6zr16k3g";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpsl-0.21.5-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libpsl";
-      sha256 = "059i6n82rd3idlbvp948rkyyd5zyvzqkbd5hgsmsvb703ncsncjk";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libidn2-2.3.7-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libidn2";
+      sha256 = "07k8zh5nb2s82md7lz22r8gim8214rhlg586lywck3zcla98jv1w";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.6-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-zstd";
-      sha256 = "09g167k7d7yliz8vlqsknnz4sp947w1v5sidp5rrgbcs2bcxcx8l";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpsl-0.21.5-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libpsl";
+      sha256 = "1mpx77q5g8pj45s8wgc52c4ww2r93080p6d559p56f558a3cl317";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtasn1-4.19.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libtasn1";
-      sha256 = "09bgm2y25jyjm0pwn2imnr30nxzdd7j71ifmxkpabaqkpsfa5av5";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-zstd-1.5.6-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-zstd";
+      sha256 = "02cp5ci8w50k7xn38mpkwnr8sn898v18wcc07y8f9sfla7vcyfix";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.25.3-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-p11-kit";
-      sha256 = "1f32pznnvzm8axhvd5406hg0ilvmlilhiqyfjky6zdk545wsyyxl";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtasn1-4.19.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libtasn1";
+      sha256 = "19m59mjxww26ah2gk9c0i512fmqpyaj6r5na564kmg6wpwvkihcj";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20240203-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-ca-certificates";
-      sha256 = "092wq5mainz3insakm9lacqa348p3ya6xnf2c3s65x7c6hw0702v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-p11-kit-0.25.3-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-p11-kit";
+      sha256 = "1jrwkc4lvw5hm5rqmi5gqh7mfkbqfa5gi81zjij0krnl0gaxw3c8";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libssh2-1.11.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libssh2";
-      sha256 = "0h4hfsig3n7grp7hn7vn16af6x122hc220llpmd8aii3d3jwc8d1";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ca-certificates-20240203-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-ca-certificates";
+      sha256 = "1q5nxhsk04gidz66ai5wgd4dr04lfyakkfja9p0r5hrgg4ppqqjg";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-nghttp2-1.61.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-nghttp2";
-      sha256 = "1ysm4pzkkrxmkyscz7li1rg3x1hv1q27v3lk6cjz1qwglxrv3zig";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libssh2-1.11.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libssh2";
+      sha256 = "0l2m823gm1rvnjmqm5ads17mxz1bhpzai5ixyhnkpzrsjxd1ygy5";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-curl-8.7.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-curl";
-      sha256 = "006j0lkpk1zdf1s577nvnvx3hk971cbnlhwppgrgg9jrrn4p8v76";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.61.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-nghttp2";
+      sha256 = "08gpir608d9sapczsmjhy5nlbg7sy24db3znvp6rmmpk6m8g79k1";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-hdf5-1.14.3-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-hdf5";
-      sha256 = "0jqngjbvdjl99555di0jip4hy861zqas5b9lgaq0f0z694q8xig4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.7.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-curl";
+      sha256 = "10ck89ik7hf1nlzlh70gmqs23n5qqzfy8g4dxwm274mww95fqzjd";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-h5py-3.10.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-h5py";
-      sha256 = "0xmy25hg2mfbmmdqmk9r7ykz629qaz45lnz8nz03r7mg42qga8i1";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hdf5-1.14.3-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-hdf5";
+      sha256 = "0pdx082m87j26cz4c2l3kr3yiv360p28qcbw9lz05l8p91jhdvfz";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pyqt5-sip-12.13.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-pyqt5-sip";
-      sha256 = "0j8l8nc5c9f46748ln46lgaw818fmqmd97493f671x1gwfi3il6j";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.10.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-h5py";
+      sha256 = "0mnwd2zps19zx5raihnyv9qz9p884x2h87cwv801l90862242f11";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-dbus-1.14.10-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-dbus";
-      sha256 = "1j735j46kj6ivmfm4np9qij4ibh0c9daznx1b0hiyzaq3dj81d5d";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.13.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-pyqt5-sip";
+      sha256 = "1100zd3xz7g7pf3z11pqj9cvzpap7yz4q58gnq5yaky51s1246h7";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-double-conversion-3.3.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-double-conversion";
-      sha256 = "1lw76bfwlc23d1rj8dissyi7mb915wimprxrikdz7bicb059vg26";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-dbus-1.14.10-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-dbus";
+      sha256 = "0qrp1bsidhq4yabwz6wgz88s3d15w1aiamvpd3hwsjg0wy49mq0g";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpng-1.6.43-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libpng";
-      sha256 = "078gvc5xy0mzqd1sm9nw6wp1jk7cdxmj8xp7s87l7lzascg1n5mc";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-double-conversion-3.3.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-double-conversion";
+      sha256 = "1jd07myjvc0dzwkh84rk7c74wv96syyfb7v99694bbbv31jkqw4g";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-wineditline-2.206-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-wineditline";
-      sha256 = "18a8cvyvmb9ilfcb1i1angp46n5c245bn3qw3ckqv86634ph86jl";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.43-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libpng";
+      sha256 = "0djnvabj3zpswga0i2k496cgs9m1xy9axc8nb0ag6w647szy77b0";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pcre2-10.43-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-pcre2";
-      sha256 = "0dnlvfjjmy65s7ywwx8pjrr1babh0ylx6qlwqvwxyy79q81fhbih";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-wineditline-2.206-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-wineditline";
+      sha256 = "0z9kn9mnh3ffl8dmsw3l1hys8k7sn6a2qys08k4cn225jr9nrmzs";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-packaging-23.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-packaging";
-      sha256 = "0gsaa1jk6f6jwqf5i8ib9agk8fh85pjn9hwfpi372lvq3n5zjwdi";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pcre2-10.43-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-pcre2";
+      sha256 = "0jrgk5afqg6czjp64a74mylfghsfrx1vrbb85ibs7qssks7h6x7k";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-glib2-2.80.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-glib2";
-      sha256 = "0bl2ffcxc509wl8mmvcdxasm0hjlqwambqwp8mn35d0dcr6bsddb";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-23.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-packaging";
+      sha256 = "0zr7i0pmj0a8m41kvr973i6hc3yjv2jxxbwp4hzwml6ynjfpb1c8";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-graphite2-1.3.14-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-graphite2";
-      sha256 = "1cgmzncx1dblny629fsrhczvsra9zz4xvhlivzl4nyyvxcqbfd3s";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.80.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-glib2";
+      sha256 = "0v5gxyayn24zss68p615p1pbdxs0fh6viah0i25rzd3854pmmcfp";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-harfbuzz-8.4.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-harfbuzz";
-      sha256 = "0hcafmwlvzz5jx18q1ghfcmzdk05dpmm0g70nn027qmf1aj67dpq";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-graphite2-1.3.14-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-graphite2";
+      sha256 = "01lgbxaanzvqmikvwqyyfvnsc71rx1vl28ixmdd112m5l4qnswnr";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-freetype-2.13.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-freetype";
-      sha256 = "0vsw6zg6sqwv3z0dv1x8g63m2dkn5nksgplida641r68lbrlsv68";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-8.4.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-harfbuzz";
+      sha256 = "1jqdphj2x9v212khzv08fmbbzy5gb3mxp9gfv7g8dhv7ia6cq20b";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-fontconfig-2.15.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-fontconfig";
-      sha256 = "05zddp7g2sm87ihmd4crs2ycwsh1rj1jhw9y0lc9y25z5hl2z8vd";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-freetype-2.13.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-freetype";
+      sha256 = "07kdykdz73jjqajarn1b1wv5mkwnwj7xw09x4iy11gpj6yz0sb8h";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-icu-74.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-icu";
-      sha256 = "10j8z4zx75ln5mwgb2x0wg695dspm5qqs3808zimw6igb9cvj8ml";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-fontconfig-2.15.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-fontconfig";
+      sha256 = "19jmphak4szjln6d3s6qpi872abc01dmzhkz4q0ws80mr8h7q78i";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libjpeg-turbo-3.0.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libjpeg-turbo";
-      sha256 = "0dxlaajh1h4x96pwk4da502v4587xg7d5b17mvv4nr14bn5slp7c";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-icu-74.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-icu";
+      sha256 = "1axzykmw3fyld9bs0xb090wsjbpdpywhdr0sm9gfallznl3c2k56";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-md4c-0.5.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-md4c";
-      sha256 = "0z6s1h8wp5cai6p79b2cwzn6q9kcacvgvc622gmga13rjxznb71i";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libjpeg-turbo";
+      sha256 = "0zks8yqkcij5krgdb6kgfq0vnhmj10sxq8zvmc9jrkwl9hbz4lc9";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-vulkan-loader-1.3.280.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-vulkan-loader";
-      sha256 = "04jlvaxx6xmhcrpqb9ng29988py5jr2zfyfwjr802xik9pvvbi5l";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-md4c-0.5.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-md4c";
+      sha256 = "1ikssajqdak1chhr84d8dzkq9ygkvmdqkrqqqv745wwwrkcmmars";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-qt5-base-5.15.13+kde+r138-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-qt5-base";
-      sha256 = "1gyzp8xz4s5wgbmh11xx8h6wvw19gvwg9a4cxxdq8y8l0yxhq8xm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.280.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-vulkan-loader";
+      sha256 = "0ij9dpxgd75b8vwalqwk2a6pfs2xp1f8ap2lcsywn080xllmnwxr";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-pyqt5-5.15.10-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-pyqt5";
-      sha256 = "0qlr553xqs49idk12vhhvqf0v7vypgc9vs3hra344xmxhjq71x5l";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.13+kde+r138-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-qt5-base";
+      sha256 = "0zfg0a6m4wyn9l5wsisqcx3ic9fn70ans8bsfl90s7z2vsc7rp2q";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-qt5-svg-5.15.13+kde+r6-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-qt5-svg";
-      sha256 = "0ckyfi890szlkhk79wnijk3v71ylbc3wfgji0rkvi5lacy1q45ky";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.10-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-pyqt5";
+      sha256 = "07pccsnbsfaa3zdkc7xbd7nklphdfkqdsi1yd84dxdsxprmp808a";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-qasync-0.27.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-qasync";
-      sha256 = "1g9fdghqpf63pq971n90dqslvlh7kxl7k4gmbgxnmqay05ycywky";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.13+kde+r6-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-qt5-svg";
+      sha256 = "0camszb46c097vs7xf4kvk9zydkbpjcm0sqm62fa4n5wlvr1zg8n";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-pyqtgraph-0.13.3-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-pyqtgraph";
-      sha256 = "063pxfcmpviwawlh1gidq6m73r3r1i3bha3hxw05z1mj6a46ym2p";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-qasync-0.27.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-qasync";
+      sha256 = "075i935vgpdaw59w29w73x6k7bwpdn22bw53pjlia5xkznqmg987";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-scipy-1.12.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-scipy";
-      sha256 = "0yr1rlq3rz55pcm9r81wi5yyw7kxqmgm3rs1ydwvlcbgar6q3ggc";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.3-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-pyqtgraph";
+      sha256 = "0kai3cpi7pbfkxp7npmz28s78jqcf1aslgz4hfara9698xg6kny6";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-six-1.16.0-4-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-six";
-      sha256 = "0hv012cnzi27pnr6v0ynygzwvmdmmjl60bdbbs3nv1x2waavv2q3";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-scipy-1.12.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-scipy";
+      sha256 = "1ifd4kml73cnza2rpfc4vfd996dj46ahcs1l9r8wfa9kpk6a80ff";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-dateutil-2.9.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-dateutil";
-      sha256 = "151cnff75zb9rg4fcw3db4cjn1hfg6cp6ykd76rai6j7hkk5zjsr";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-six-1.16.0-4-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-six";
+      sha256 = "1f4f1jk9mrgd0a1xpjxahasbwd2x2kah53jkjfkimif120ynqqdg";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-wcwidth-0.2.13-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-wcwidth";
-      sha256 = "046gy1wq95a2381nmaii1i6jlnk0rly8w6wym79gdw4n4ycvm79w";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-dateutil-2.9.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-dateutil";
+      sha256 = "15zbs5jxh2id2hdskprf0p85nh4y1bgngwgbq482hc31nq5gsls1";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-prettytable-3.10.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-prettytable";
-      sha256 = "16nh16rsgcbaa2943c3hh6dkhdlnps4lq0hlajv8fwn38k0nz1vg";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-wcwidth-0.2.13-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-wcwidth";
+      sha256 = "0c1k6kqfgirlm0xqigajbx6fv51v0lm95y1g39w1klij2dq4jk5q";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-colorama-0.4.6-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-colorama";
-      sha256 = "0f62gmhgfwxnhk5sbqfd0qlzhbwis3qxzr625sdyq1xa46yr3ddy";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-prettytable-3.10.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-prettytable";
+      sha256 = "1d0xx49bacqz1b55q8yp13pkfj8yhfsazibk6zlmld5ac7blk6cw";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-tqdm-4.66.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-tqdm";
-      sha256 = "036mzpi0ncdif1j3npxkcrsp3d3xzwl9jrg6hwnlm6chgnp29gr8";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-colorama-0.4.6-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-colorama";
+      sha256 = "10mw2pirqrw3gk28alnk6l29v4b3z3w45xlr8fvzdbpvzhfrwgkn";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-http-parser-2.9.4-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-http-parser";
-      sha256 = "09s8l8v7s6yx3vl114bxc2zbcgdlv95pq5amp80wdfbgd0dzinda";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.66.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-tqdm";
+      sha256 = "1ag9wr3xpq63naa2c45lz3csvwkkq8plxf0ajxfbb2chh67jspwq";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libgit2-1.7.2-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libgit2";
-      sha256 = "03ddnkar6m68ijhvaik61ng0672l0pcr0lpdd9f8ply4iwpjzf4j";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-http-parser-2.9.4-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-http-parser";
+      sha256 = "0bmnpq7cqihspyma4xxg3rsz4z8wqc294pi7wfy2vxn26m82rfy5";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-ply-3.11-4-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-ply";
-      sha256 = "057bmgxnfr5vklhhsksnpaa5kw8cvnp53ib8kykpqfqcsglmjhws";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libgit2-1.7.2-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libgit2";
+      sha256 = "1kb4krbr9as9la9s56s52ybgwzwnjkkbkfvcv32jb0wvj4yjwczx";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-pycparser-2.21-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-pycparser";
-      sha256 = "1kmwp0j3l8fbpbf1np0ilck9wi7pwm3bzq62jcjjxw4ciwrbxbii";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-ply-3.11-4-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-ply";
+      sha256 = "01shxamb2sm761nmy0zqakv57zn93kmck2sk9phvcjnlc6h776jr";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-cffi-1.16.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-cffi";
-      sha256 = "1cs3ajs56pkg24l7xsa5s0n70g9i63jkm8hqslxazjl2v007iiwd";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.21-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-pycparser";
+      sha256 = "0qnjqlqz1qbklhyl65whxfm2l6p1imrjqc7kpqc1rx92fm59pbp8";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-pygit2-1.14.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-pygit2";
-      sha256 = "08ny0yg92fg413q8jzwp4qvz41vy77ajg75kib4zhva6025rxa0g";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-cffi-1.16.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-cffi";
+      sha256 = "0ymgaaynxsdra8cr10gvym5wgk5c4vjsnwlq4pzy7g55v4gn0piz";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-llvmlite-0.42.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-llvmlite";
-      sha256 = "0l56iwa0ndxyprz6fw3n4hnd6l47lmvfzshw83x2ygbynls5j3jm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pygit2-1.14.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-pygit2";
+      sha256 = "0wbzlbfcyl4i55xf3chfjpwhwj5jqg4pqv3m5qcslmm573xfyki5";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-rapidfuzz-3.6.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-rapidfuzz";
-      sha256 = "0mp04k3rylfs3f6ccslg61zkg99y5x14iv1lzpdsdyglk9zd6rkg";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.42.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-llvmlite";
+      sha256 = "0qw88ickp41jvgxvf1dfhn5yz7zsn9q51ra3m522hx1lbqixgn8z";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-levenshtein-0.25.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-levenshtein";
-      sha256 = "0i89a7zkj1gvb08zhnrm3h606yd90a4nfmm2j4cbfvfixqjijibm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rapidfuzz-3.6.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-rapidfuzz";
+      sha256 = "10mc1h0hcd0mmf9hj0ynl9mfjihliaj0a61q2d087v5fbwf8v0kn";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lmdb-0.9.31-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-lmdb";
-      sha256 = "1dzr764y6by4p8mlg3dd0ljmxnbv961clgxssxnz6khhgr4riz3i";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-levenshtein-0.25.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-levenshtein";
+      sha256 = "0bwx8q9lv8i2ax8y5yw7pn5gzp804rqc55ijdkw83my33l1758wa";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-lmdb-1.4.1-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-lmdb";
-      sha256 = "1v6xs6bl4bnyn2a1w9y2k4jsd8qgyp2mdfp00mb2vf01dsbm1l6f";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lmdb-0.9.31-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-lmdb";
+      sha256 = "1gz4b261klr37xb56kj5ybymrsh6q237wkssmkjg32dy511asbiw";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libxml2-2.12.6-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libxml2";
-      sha256 = "0nqhq9whrzq6m1xscnx12g2q8bv6jaak43ly7q4viqd1zfin1abx";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-lmdb-1.4.1-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-lmdb";
+      sha256 = "08b8pja1vhh7z0nrccr01qyfpkjqq8400ra0nvhpincwlaw5rcwn";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-libs-18.1.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-llvm-libs";
-      sha256 = "0jl2l400z0rj60hcpr5nms8f1iwdlky4rgzk37ysvfsv2s3xb3g3";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libxml2";
+      sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-18.1.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-lld";
-      sha256 = "1fc4pbzkm9wc2i874vfaxbin2p7bryx1yan1n0vvzddr747qxi21";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm-libs";
+      sha256 = "0ivab5znxbpdi289pcasxjbkfw6wamcjbblhkcbhfiacvbbhf8pq";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-18.1.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-llvm";
-      sha256 = "0446wv29vp1pld6drjaw1lr93lijcvn6l66jj4r5m1gyrf07jhlh";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-lld";
+      sha256 = "160mfkxird6l17kvqapk58ljy07ql1blsxmrgxbf16hic39mfl0g";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-hidapi-0.14.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-hidapi";
-      sha256 = "05k8papxsnnvz26761gjfpc7h3db89j7kdg9jyfyd9g5nmpy18x5";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm";
+      sha256 = "0yirvz2zqgw9hpj0lrx50h1rnpg30632zdbqacq9p7rwviwkwkmn";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libusb-1.0.27-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libusb";
-      sha256 = "1jjdj6njc3yapki1ffj7q5hcy6sd3gqrwyf830bgg72kmc8lxpwl";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hidapi-0.14.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-hidapi";
+      sha256 = "1nq7pw80l4awl7pz7qm5bfffv661fxraxh2kgd78m9y0dknvglxa";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libusb-compat-git-r76.b5db9d0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libusb-compat-git";
-      sha256 = "0x9gczdy09mjrj3cybl0qyk77466lhpcjv23r5z1851yq70ilhz9";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libusb-1.0.27-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libusb";
+      sha256 = "1g5fib7a7sjwm1gv8a1y0r2cigfz2d9hp4sszakqcrpxsr4652im";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-confuse-3.3-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-confuse";
-      sha256 = "0cv020y67984jax23v3iwi9kcn753qafhqsida44y6jhd1znjjpm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libusb-compat-git-r76.b5db9d0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libusb-compat-git";
+      sha256 = "0fls0kah3dq2fw4fay4ihb4ym9nscswldijif77vyim6awvf24kv";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libftdi-1.5-7-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libftdi";
-      sha256 = "0pcrwic5wgdjhs5vvynz8fw2hiqbaz75kikl61gmzqxshm619b2v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-confuse-3.3-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-confuse";
+      sha256 = "0dyzriph24pin5n8qzsahvvjvyi95ndxpvyqyhai0spmc28lmw9z";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libjaylink-git-r175.cfccbc9-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libjaylink-git";
-      sha256 = "053vp2jak9qrl3di5syr6bw7z1hspx5744027knb6irm3kpa1iki";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libftdi-1.5-7-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libftdi";
+      sha256 = "1il49b4mqhywgl49h27227xbw96af1wz7kpaawhh4qkym3rxqkzd";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-capstone-5.0.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-capstone";
-      sha256 = "1awzx375s3fidrc80l3dhc78cd7wyssvxjlaz9jnbpa3cy5qxl7z";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjaylink-git-r175.cfccbc9-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libjaylink-git";
+      sha256 = "1ckc04xc06cv2z7bls878m274g2paqar7nb36zza2gxc78paz9sc";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openocd-0.12.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-openocd";
-      sha256 = "1na5blv3kajiic8f1igyanbmva6rj8flxam5xmg9d23v8yr99z6a";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.1-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-capstone";
+      sha256 = "0xdg50a43jjqqy63x69ns25blk6vz93lylj27cd78f6fcda75hpg";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bscan-spi-bitstreams-1.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-bscan-spi-bitstreams";
-      sha256 = "0facp60r9364fkrxx6vfrbivr00yiq99n6n24f5snqb8vqc2mrd1";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openocd-0.12.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-openocd";
+      sha256 = "1f6ynv7czk9g848322847dj8xqhdsy9hjkz3flg6p1znf41cxdmc";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-attrs-23.2.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-attrs";
-      sha256 = "0jvm2jdgcrphwq61n3kj8ialy18m8lbj6xq3jgwbi8qqjlw9s1n7";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-bscan-spi-bitstreams-1.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-bscan-spi-bitstreams";
+      sha256 = "05yfr0xaqdfyl315x2sls26nx0ifqbpghya3ixvpmcks4zjcgkrw";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-multidict-6.0.5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-multidict";
-      sha256 = "0hc7d031m3f8dq3qyvspgs5m2n8x7sljvr6j573ini4cn78w3y0p";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-attrs-23.2.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-attrs";
+      sha256 = "0bcmz0b0s18s0pwpkvv6g7hph7bvr9mgyips409kkazw168iikab";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-idna-3.6-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-idna";
-      sha256 = "0fzkcd2c2c0crqg4690lrizwm9q4338bfn6w46k855gp5l83f4ww";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-multidict-6.0.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-multidict";
+      sha256 = "1dx4cxznbih3ijnlmki6x0g8a3q1qg71wmsw7jrd82kwrh31x67i";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-yarl-1.9.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-yarl";
-      sha256 = "0y9790lq8kq713v08ypmbxxn48fdfbigkdv78jf1dl570vav72pw";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.6-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-idna";
+      sha256 = "11wyiz1iad9q5smd42dprymw2670c5swqbigpj2v30zs6nhkabnm";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-frozenlist-1.4.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-frozenlist";
-      sha256 = "0if893h135p6qzldhl9f5a604whlj9viy3sj5p8mlkr6zyxww7p3";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-yarl-1.9.4-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-yarl";
+      sha256 = "1n8b0460q526q9w7i53a1jydma81c1sdg9h4ayy030fxx7zsn4id";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-aiosignal-1.3.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-aiosignal";
-      sha256 = "0mpp79fx5f0sfjfrqxk0vmc5b13mkl779gwjg5ca38hjqzkycmgy";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-frozenlist-1.4.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-frozenlist";
+      sha256 = "1dny1z3d7ddb01im45fjppvkvxqkpah5dmy8w74y6b21afza4q2a";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-aiohttp-3.9.3-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-aiohttp";
-      sha256 = "17qym6rwq1w37a6ph0drvz7jqmnm8k0pc3cnbhfj135cq0z79q96";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiosignal-1.3.1-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-aiosignal";
+      sha256 = "0s4lj5sfal2rd2naab1j1qc1wh7qxc4d7blg3z1gxhx2g2lyqln2";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-regex-2023.12.25-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-regex";
-      sha256 = "17hmnaw3fvcbnzjbm6i7drs3i5j2rsdmxq2c841n497ks30xa5r4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiohttp-3.9.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-aiohttp";
+      sha256 = "1ykf2djwnsdaxw0lkq8wivrwfwg3h72kdxfkb96n76nim9gcffim";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-pybase64-1.3.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-pybase64";
-      sha256 = "0wnwfacimz7jxv2cnpn9z4x5fbz0fyin04grab3pslrl5xa4shyr";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2023.12.25-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-regex";
+      sha256 = "1wy6hicjnawh4265wkjpw95l1ji2ggx2z7f6a7wl3flm74fn47nw";
+    })
+
+    (pkgs.fetchurl {
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-pybase64";
+      sha256 = "0cj217d6xcagxismbwncdfy4px1l2axpn6h9zy3bwkh3bwywssk9";
     })
 ]
diff --git a/msys2/comtools_dependencies.txt b/msys2/comtools_dependencies.txt
index bc99002..6dd15df 100644
--- a/msys2/comtools_dependencies.txt
+++ b/msys2/comtools_dependencies.txt
@@ -1,3 +1,3 @@
-mingw-w64-x86_64-python3.11
-mingw-w64-x86_64-python-numpy
-mingw-w64-x86_64-python-aiohttp
+mingw-w64-clang-x86_64-python3.11
+mingw-w64-clang-x86_64-python-numpy
+mingw-w64-clang-x86_64-python-aiohttp
diff --git a/msys2/default.nix b/msys2/default.nix
index 5c16353..608c295 100644
--- a/msys2/default.nix
+++ b/msys2/default.nix
@@ -19,14 +19,14 @@ let
   wine-msys2 = pkgs.writeShellScriptBin "wine-msys2"
     ''
     export WINEDEBUG=-all
-    export WINEPATH=Z:${msys2-env}/mingw64/bin
+    export WINEPATH=Z:${msys2-env}/clang64/bin
     exec ${pkgs.wineWowPackages.stable}/bin/wine64 cmd
     '';
   wine-msys2-build = pkgs.writeShellScriptBin "wine-msys2-build"
     ''
     export HOME=`mktemp -d`
     export WINEDEBUG=-all
-    export WINEPATH=Z:${msys2-env}/mingw64/bin
+    export WINEPATH=Z:${msys2-env}/clang64/bin
     ${silenceFontconfig}
     exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@
     '';
@@ -46,8 +46,8 @@ in {
       export DRV_VERSION=${version}
       ${prepare}
       cat > PKGBUILD << HEREDOC
-      pkgbase="mingw-w64-${name}"
-      pkgname="mingw-w64-x86_64-${name}"
+      pkgbase="mingw-w64-clang-${name}"
+      pkgname="mingw-w64-clang-x86_64-${name}"
       pkgrel=1
       depends=(
         ${pkgs.lib.concatStringsSep "\n" (map (depend: "\"${depend}\"") depends)}
diff --git a/msys2/make_msys2_packages.sh b/msys2/make_msys2_packages.sh
index 31a973a..2d3d62e 100755
--- a/msys2/make_msys2_packages.sh
+++ b/msys2/make_msys2_packages.sh
@@ -13,14 +13,14 @@ curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pac
 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
 pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
   --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \
-  mingw-w64-x86_64-cc mingw-w64-x86_64-python3.11 \
-  mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+  mingw-w64-clang-x86_64-cc mingw-w64-clang-x86_64-python3.11 \
+  mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
 
 cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
   --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" -  > $MSYS2DIR/artiq_dependency_packages.txt
 
 pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache \
-  --sync --print-format "%l %n" mingw-w64-x86_64-qt-installer-framework > $MSYS2DIR/qt_ifw_packages.txt
+  --sync --print-format "%l %n" mingw-w64-clang-x86_64-qt-installer-framework > $MSYS2DIR/qt_ifw_packages.txt
 
 function generate_nix_packages_from_pacman() {
     echo "{ pkgs } : [" > $OUT
diff --git a/msys2/msys2_packages.nix b/msys2/msys2_packages.nix
index 7b3af12..54ba2ee 100644
--- a/msys2/msys2_packages.nix
+++ b/msys2/msys2_packages.nix
@@ -1,218 +1,224 @@
 { pkgs } : [
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r731.g8fdf7c9b5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libwinpthread-git";
-      sha256 = "1q5mjrsxxrqa0vm9vn1hqr0ijn7b24lkyzyx5hymlksdbx3r0b29";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libunwind";
+      sha256 = "16k6kng1z1cxlw6al5g17zwm1dd1myildzk9n30qr2ljygrc5ncl";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-6-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gcc-libs";
-      sha256 = "1wg64p13ldw3f9cl2na4dz8avj06a8xj9fdk9z6h2h2gp1ipgici";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libc++";
+      sha256 = "0zdgdzck0qyyc5vqg3i5d1rpsbzf0fl15bvwqzs3wqr01z7q35dm";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-4-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libiconv";
-      sha256 = "0mvamv1maj479lch0spfa25i27yfsb2795v1kpv6z3py8rmv7vff";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libffi-3.4.6-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libffi";
+      sha256 = "1q6gms980985bp087rnnpvz2fwfakgm5266izfk3b1mbp620s1yv";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-runtime-0.22.5-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gettext-runtime";
-      sha256 = "0kdjkscdgaxgb073a1ga07g5p53vh3cn6aaa9q96shsb7fbd3aqz";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libiconv-1.17-4-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libiconv";
+      sha256 = "1g2bkhgf60dywccxw911ydyigf3m25yqfh81m5099swr7mjsmzyf";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.3.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-zlib";
-      sha256 = "1w05h62i4bcvkr09lzf442dx4ybf80w31m82clhxw59ysypwl16a";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-gettext-runtime-0.22.5-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-gettext-runtime";
+      sha256 = "0ll6ci6d3mc7g04q0xixjc209bh8r874dqbczgns69jsad3wg6mi";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.6-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-zstd";
-      sha256 = "09g167k7d7yliz8vlqsknnz4sp947w1v5sidp5rrgbcs2bcxcx8l";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.1-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-xz";
+      sha256 = "12wj7015dy3gafvnf95bww60nkk35lwzzg9p6114qv1jr6q6hbdh";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.42-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-binutils";
-      sha256 = "16gl687nfsm8n0f78c4s16wwx592f3wd0kcfrna49xblyrr5gadm";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-zlib-1.3.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-zlib";
+      sha256 = "06i9xjsskf4ddb2ph4h31md5c7imj9mzjhd4lc4q44j8dmpc1w5p";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-11.0.0.r731.g8fdf7c9b5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-headers-git";
-      sha256 = "1q5d71dy8jhqb3nm1xiv7psmxdninhpbkvlgsrcdzm8nvqcmlcqr";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libxml2";
+      sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-11.0.0.r731.g8fdf7c9b5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-crt-git";
-      sha256 = "1n1ibknmsc269lbj30105haaa8alg1yrcfc2cmvhyl76pv423zqw";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-zstd-1.5.6-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-zstd";
+      sha256 = "02cp5ci8w50k7xn38mpkwnr8sn898v18wcc07y8f9sfla7vcyfix";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.3.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gmp";
-      sha256 = "1k0ma22hyn5m2m8kflpmscwm2p1v53pzd93fnind9bf4fhwl6949";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm-libs";
+      sha256 = "0ivab5znxbpdi289pcasxjbkfw6wamcjbblhkcbhfiacvbbhf8pq";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.26-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-isl";
-      sha256 = "0hfycibi23xkah9sw60n4ka786l8vmlc67d2waw9mwqqljdmx7pr";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm";
+      sha256 = "0yirvz2zqgw9hpj0lrx50h1rnpg30632zdbqacq9p7rwviwkwkmn";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-mpfr";
-      sha256 = "1j96kipr7mzawngjhi9m0rh2lhylmggg1mkgkipw9ssrsxxf7g97";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-clang-libs";
+      sha256 = "0x4hfvcdjvjzdn0j2w5xnacfjhsz05v04lap65pnydsgvlj4sj49";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-mpc";
-      sha256 = "04md7pzz6rwvlsxzgxn8zc6l5lmqn1w2dg9f5xdf13qbl9zfm615";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-compiler-rt";
+      sha256 = "0xxlj18mrhxjiz7hl4jk1jr0i5isw7mlrgkdnpkc307k680i1knz";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-windows-default-manifest-6.4-4-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-windows-default-manifest";
-      sha256 = "1ylipf8k9j7bgmwndkib2l29mds394i7jcij7a6ciag4kynlhsvi";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-11.0.0.r744.ge5ac8c550-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-headers-git";
+      sha256 = "19c88b1bfa73ima00s15271pvxxz1a79b0cpvqg9vwnzk0ydy3v7";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-11.0.0.r731.g8fdf7c9b5-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-winpthreads-git";
-      sha256 = "0jvrzmbac86pl5rc2xi8q931r1rhvf8k8bs83zywkv1v22qcgi1a";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-11.0.0.r744.ge5ac8c550-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-crt-git";
+      sha256 = "17rfl7d1ya8mg51a07x84q4dj0wvnjsss9r655ywd36qa2h7g9an";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.2.0-6-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gcc";
-      sha256 = "0j13crl29s8w24kjig0gny68d7ag6n4mgzwyb9ddph23cwqv0l3h";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-lld";
+      sha256 = "160mfkxird6l17kvqapk58ljy07ql1blsxmrgxbf16hic39mfl0g";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-expat";
-      sha256 = "13zp12yp286i8pbyqcvgdzln0c6r8hs9jfbwvrbbimhq57jcy91q";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-11.0.0.r744.ge5ac8c550-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libwinpthread-git";
+      sha256 = "1r320i80r7ga00j4kvq39gf9xpyylyhdfaspjgjsnan3hjlr6d2w";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-bzip2";
-      sha256 = "1dki26kz4pmr9q3gp3dirrvrwkcv38b9sjrb9slrq4yw31ycjgk5";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-11.0.0.r744.ge5ac8c550-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-winpthreads-git";
+      sha256 = "0vx3l0za258q2msklcwxi7bsyh064vfddav277sscrsdj80prf2x";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.6-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libffi";
-      sha256 = "018sv8b54ym24qmyc61sxhjix3rrbmvj04plhy5i0k92qnk2hnv4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-clang";
+      sha256 = "07zzfdckxib9nlpmnwxbbxbhrnmq93yqm9w2h3iij27w0jdzz3r2";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpdecimal-4.0.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-mpdecimal";
-      sha256 = "1dm8hjj0l1q48fv0li0x5xn8yfy6a6ywicqm0i8v0c13qfa5hv7v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-expat";
+      sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libtre-git";
-      sha256 = "1fphiijfdz1zn3j11fq16fvqx88vms78d2rawsgrqd5janbq4flb";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-bzip2";
+      sha256 = "1n8zf2kk1xj7wiszp6mjchy1yzpalddbj0cj17qm625ags2vzflm";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-libsystre";
-      sha256 = "0q67s9p1dcfzhhr1qsji7g3fpwsi223b5s1c4d74sczn3kvkrd6v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-mpdecimal-4.0.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-mpdecimal";
+      sha256 = "0hrhbjgi0g3jqpw8himshqw6vazm5sxhsfmyg386nbrxwnfgl1gb";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-ncurses";
-      sha256 = "00sx48qazh5nh70fyi9nd8l6498b97fmy9p6vmbsr3pjbwkwpznk";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libtre-git";
+      sha256 = "0fc9hxsdks1xy5fv0rcna433hlzf6jhs77hg0hfzkzhn06f9alp4";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.3.0-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-openssl";
-      sha256 = "14p37hlj3vn0jb6grfwycjvlfakjbbj3h2fqw1xcj4al0dby2xsd";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-libsystre";
+      sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-7-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-termcap";
-      sha256 = "1s51i2fwy1mrzmxsgr1vv87wlmb3bk88yipqalfldvy3xdgjgjh4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-ncurses";
+      sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-readline";
-      sha256 = "1qcgv32jrgs9fycqg5qyq40rkxxvjf7j6dnkprhf8zlnzhl3ymaa";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.0-2-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-openssl";
+      sha256 = "0r9hvrvs1mywa1ilw2jd8z6dp7n7rgqc5qixcgagpn37b1vmvl4s";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.13-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tcl";
-      sha256 = "1h6sgjmqp2akm4nc64cmj87zr8iaa9m4wg1rgqhhs3x8a904m6by";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-termcap-1.3.1-7-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-termcap";
+      sha256 = "17ha468qavwin800cc3b7c3xdggwk2gakasfxg7jdx7616d99l0n";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.45.2-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-sqlite3";
-      sha256 = "1rzjzhhji3wmggccv8av5gcqxl3d0wdyrfaj3g8v4gfqql9f525y";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-readline";
+      sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.13-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tk";
-      sha256 = "093j1hkjs60nimbnad7jc7190pr2xrwx4nrz22g159dq770cc4xp";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tcl-8.6.13-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tcl";
+      sha256 = "0paaqwk0sfy2zxwlxkmxf2bqq46lyg0sx7cqgzknvazwx8xa2z4x";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.6.1-2-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-xz";
-      sha256 = "089v96imr9fyg38v6hmpacd997dxz9c37fkqq4y03gcc4skj7078";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.45.2-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-sqlite3";
+      sha256 = "1icvw3f08cgi94p0177i46v72wgpsxw95p6kd0sm2w3vj0qlqbcw";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tzdata-2024a-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-tzdata";
-      sha256 = "1yjcndq1bhfy5mw04c8k5rbmknrcgkq023b0gvwra15spj2c1h9v";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tk-8.6.13-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tk";
+      sha256 = "12f6lqx1sglczcnz2ns6sxw9cxwm1klxajqzcrbnfwln1nllz2nd";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.11.9-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python";
-      sha256 = "1iv0pg26g8p7sqpjqzh0xdx6s9wi8l70kqkansky96nbqx2byp3f";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-tzdata";
+      sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.2.0-6-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-gcc-libgfortran";
-      sha256 = "1jmncy2drswx441dhxxs4i471d5lyqdn7faxd6qdni0g6vd56qir";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python";
+      sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-openblas";
-      sha256 = "1130ir15sq54mnhyr50yljkm1jj5s40lqkdhsmvk7rwlykl67jq4";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.5-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-llvm-openmp";
+      sha256 = "1jkvghfra2gm973sk5m407f3lp55gp7c1ss97g52qsj144vpgf0i";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-numpy";
-      sha256 = "1mhsnh3gvqhlq4m1m21xsfdf4zb0yrzvfp88hqcy6s1iiy5w4ync";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-openblas";
+      sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k";
     })
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-setuptools-69.1.1-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-python-setuptools";
-      sha256 = "0ih9y27m58c2mlj4g9sg90skbm8r2n60f71ayv7ilgqpl7k9s15j";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-numpy";
+      sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
+    })
+
+    (pkgs.fetchurl {
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-69.1.1-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-python-setuptools";
+      sha256 = "1mc56anasj0v92nlg84m3pa7dbqgjakxw0b4ibqlrr9cq0xzsg4b";
     })
 ]
diff --git a/msys2/msys2_qt_ifw_packages.nix b/msys2/msys2_qt_ifw_packages.nix
index fea6325..25c05da 100644
--- a/msys2/msys2_qt_ifw_packages.nix
+++ b/msys2/msys2_qt_ifw_packages.nix
@@ -1,8 +1,8 @@
 { pkgs } : [
 
     (pkgs.fetchurl {
-      url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-qt-installer-framework-4.7.0-1-any.pkg.tar.zst";
-      name = "mingw-w64-x86_64-qt-installer-framework";
-      sha256 = "188mb11y4ljyc52z0crp5xx63n19yr1bmcqi3qndvj5w5bmm2zgx";
+      url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt-installer-framework-4.7.0-1-any.pkg.tar.zst";
+      name = "mingw-w64-clang-x86_64-qt-installer-framework";
+      sha256 = "02a9sx7l8gkq800kg88vlakpxqz2ka7mjfrvkmnpw20vwmai8cmb";
     })
 ]
diff --git a/msys2/pythonparser_dependencies.txt b/msys2/pythonparser_dependencies.txt
index 20a096a..1cab32c 100644
--- a/msys2/pythonparser_dependencies.txt
+++ b/msys2/pythonparser_dependencies.txt
@@ -1 +1 @@
-mingw-w64-x86_64-python-regex
+mingw-w64-clang-x86_64-python-regex
diff --git a/msys2/sipyco_dependencies.txt b/msys2/sipyco_dependencies.txt
index 01a0005..a33a5e6 100644
--- a/msys2/sipyco_dependencies.txt
+++ b/msys2/sipyco_dependencies.txt
@@ -1,3 +1,3 @@
-mingw-w64-x86_64-python3.11
-mingw-w64-x86_64-python-numpy
-mingw-w64-x86_64-python-pybase64
+mingw-w64-clang-x86_64-python3.11
+mingw-w64-clang-x86_64-python-numpy
+mingw-w64-clang-x86_64-python-pybase64
-- 
2.47.0