From d92b8c9d8a151d4ccb83df4c1c85ad96d5c1a781 Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Wed, 13 Nov 2024 16:21:32 +0800 Subject: [PATCH] Switch stable artiq to python3.12 to fix the packaging issues Signed-off-by: Egor Savkin --- flake.lock | 30 +-- flake.nix | 2 +- msys2/PKGBUILD.common | 4 +- msys2/artiq_dependencies.txt | 3 +- msys2/artiq_dependency_packages.nix | 290 +++++++++++++++------------- msys2/comtools_dependencies.txt | 2 +- msys2/make_msys2_packages.sh | 2 +- msys2/msys2_packages.nix | 106 +++++----- msys2/sipyco_dependencies.txt | 2 +- 9 files changed, 233 insertions(+), 208 deletions(-) diff --git a/flake.lock b/flake.lock index a01100c..bea4f10 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ "src-pythonparser": "src-pythonparser" }, "locked": { - "lastModified": 1729235003, - "narHash": "sha256-N0PAAtYNO2gyxEmuQpVzjWzXqbjag6nBSMdwVS2+KzI=", + "lastModified": 1730350041, + "narHash": "sha256-+N4ETMvFwIvIa5LdhQxdo9xjmtAp7phw+TTXZvHovCA=", "ref": "release-8", - "rev": "2c26199ac2a3bed76820983eaca83955607992b0", - "revCount": 8968, + "rev": "80ae6f5014f7c2b603883d362cb3c24d24eebf61", + "revCount": 8973, "type": "git", "url": "https://github.com/m-labs/artiq.git" }, @@ -99,11 +99,11 @@ "trap-dac-utils": "trap-dac-utils" }, "locked": { - "lastModified": 1726093238, - "narHash": "sha256-C0cfjrQgsDIRg/mEbEDVYIpH4Z8cqYN6VJ92UoTJYoU=", + "lastModified": 1729547028, + "narHash": "sha256-l7GGLjTrGtF23XYsdjQmLPgccDDUwjbGQQsQ3lhn/SI=", "ref": "refs/heads/master", - "rev": "c3b06ea1d87b2701fba4472f0a1fe0b5d556fefc", - "revCount": 1382, + "rev": "dbe0e8f3902527c6254589303e020db08760dd85", + "revCount": 1384, "type": "git", "url": "https://gitlab.com/duke-artiq/dax.git" }, @@ -206,11 +206,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "src-misoc": { "flake": false, "locked": { - "lastModified": 1728978817, - "narHash": "sha256-b4633jrhh4i+KunZq4kNlyhdm9BCsEJwKs+6KINKV2o=", + "lastModified": 1729234629, + "narHash": "sha256-TLsTCXV5AC2xh+bS7EhBVBKqdqIU3eKrnlWcFF9LtAM=", "ref": "refs/heads/master", - "rev": "386b544776b66cea148da67d06a4b3a4151179f9", - "revCount": 2459, + "rev": "6085a312bca26adeca6584e37d08c8ba2e1d6e38", + "revCount": 2460, "submodules": true, "type": "git", "url": "https://github.com/m-labs/misoc.git" diff --git a/flake.nix b/flake.nix index 4ad885e..a6a8a62 100644 --- a/flake.nix +++ b/flake.nix @@ -282,7 +282,7 @@ postInstall = '' # conflicts with linien-client - rm -rf $out/lib/python3.11/site-packages/linien/__pycache__ + rm -rf $out/lib/python3.12/site-packages/linien/__pycache__ ''; }; # replace broken (as usual) setuptools launcher diff --git a/msys2/PKGBUILD.common b/msys2/PKGBUILD.common index 9768adb..07d829f 100644 --- a/msys2/PKGBUILD.common +++ b/msys2/PKGBUILD.common @@ -7,7 +7,7 @@ sha256sums=("SKIP") build() { mkdir clang64 - export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages + export PYTHONPATH=`pwd`/clang64/lib/python3.12/site-packages chmod +w -R source cd source wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt @@ -15,7 +15,7 @@ build() { # 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 clang64/lib/python3.11/site-packages/easy-install.pth + rm -f clang64/lib/python3.12/site-packages/easy-install.pth # patch broken shebangs (Z:/nix/store/...) for entrypoint in clang64/bin/*-script.py; do [ -f "$entrypoint" ] || continue diff --git a/msys2/artiq_dependencies.txt b/msys2/artiq_dependencies.txt index 02b32db..23934b1 100644 --- a/msys2/artiq_dependencies.txt +++ b/msys2/artiq_dependencies.txt @@ -1,4 +1,4 @@ -mingw-w64-clang-x86_64-python3.11 +mingw-w64-clang-x86_64-python mingw-w64-clang-x86_64-python-h5py mingw-w64-clang-x86_64-python-pyqt5 mingw-w64-clang-x86_64-qt5-svg @@ -16,3 +16,4 @@ 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 +mingw-w64-clang-x86_64-python-jsonschema diff --git a/msys2/artiq_dependency_packages.nix b/msys2/artiq_dependency_packages.nix index c02f560..fa520bb 100644 --- a/msys2/artiq_dependency_packages.nix +++ b/msys2/artiq_dependency_packages.nix @@ -1,21 +1,21 @@ { pkgs } : [ (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libunwind"; - sha256 = "1v8zkfcbf1ga2ndpd1j0dwv5s1rassxs2b5pjhcsmqwjcvczba1m"; + sha256 = "0f9m76dx40iy794nfks0360gvjhdg6yngb2lyhwp4xd76rn5081m"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libc++"; - sha256 = "0mfd8wrmgx12j5gf354j7pk1l3lg9ykxvq75xdk3jipsr6hbn846"; + sha256 = "17savj9wys9my2ji7vyba7wwqkvzdjwnkb3k4858wxrjbzbfa6lk"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.4-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-expat"; - sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38"; + sha256 = "03fp2yacv7gk0g049lffz6pbj93vpjmzqxxa312d4gxczi57nqdv"; }) (pkgs.fetchurl { @@ -49,27 +49,27 @@ }) (pkgs.fetchurl { - 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"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-0.9.0-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-libtre"; + sha256 = "1y5d2cbkpd0ngqlsv6hvz47nxb1wry33i5s1clg2k53yhgjkg8vv"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-6-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libsystre"; - sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq"; + sha256 = "19c71fs5gqjrf88mv7l702fjg228xd9lfbxg0mkzm3ljvv4ljn0q"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.5.20240831-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-ncurses"; - sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza"; + sha256 = "1hlfj9g4s767s502sawwbcv4a0xd3ym3ip4jswmhq48wh5050iyb"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.4.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-openssl"; - sha256 = "0ywhwm4kw3qjzv0872qwabnsq2rzbmqjb9m69q3fykjl0m9gigsa"; + sha256 = "0cgiqjmgdnwnv9r88z634dmqrzh06dmsfncyzymw0s16nnv2k7k2"; }) (pkgs.fetchurl { @@ -79,9 +79,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-readline"; - sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; + sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr"; }) (pkgs.fetchurl { @@ -97,9 +97,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-sqlite3"; - sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; + sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq"; }) (pkgs.fetchurl { @@ -109,27 +109,27 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.2-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.3-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-xz"; - sha256 = "0phb9hwqksk1rg29yhwlc7si78zav19c2kac0i841pc7mc2n9gzx"; + sha256 = "09cbqivx9afh7wnqi5iiyrbhnv3y2qc9h1brm420sjpaqhz4prkv"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024b-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-tzdata"; - sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji"; + sha256 = "0jihnr1i7vyzczxz60ds1x3gcm3p4ad2pq9d5vvpwjdwrxkvxmkc"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.12.7-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python"; - sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c"; + sha256 = "1c71xm6dp700qw1vzwy97bqk5093yhhzvk8p498z2zdn92s1dxj9"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r386.gc6857dc97-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libwinpthread-git"; - sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb"; + sha256 = "0r5rxcabg09023llyim59w0vcpn8ycx53v9acln4gpjxcgn3b96c"; }) (pkgs.fetchurl { @@ -139,15 +139,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-openblas"; - sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; + sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-2.1.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-numpy"; - sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; + sha256 = "1kiy7ail04ias47xbbhl9vpsz02g0g3f29ncgx5gcks9vgqldp6m"; }) (pkgs.fetchurl { @@ -157,15 +157,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.29.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.34.2-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-c-ares"; - sha256 = "01xg1h1a8kda0kq2921w25ybvm1ms7lfdzday0hv93f3myq7briq"; + sha256 = "036jrzcc8dsaq9dqi3wprc7bbph7j88v94256f700f8qm8mbp5la"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-brotli"; - sha256 = "1q01lz9lcyrjmkhv9rddgjazmk7warlcmwhc4qkq9y6h0yfsb71n"; + sha256 = "0l7m7cbxxw9gr1h4a8i5b6sxc2j9hsy3cy3r70xadd61kjxrxi6k"; }) (pkgs.fetchurl { @@ -217,39 +217,39 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.61.0-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.63.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-nghttp2"; - sha256 = "07bkk98126gy4k6lb9rrqqnzjfz9j2rsr5dzr2djmzdkw0h4dr95"; + sha256 = "0lfqrlmapsc7ilxjmhr7hxi578vclqlhpqimbvzq0c70c0iwk864"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.4.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.6.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-nghttp3"; - sha256 = "007w2252nzn274j4wjc1vf56xyzzh5vg3blj1hil7mlmffgvc923"; + sha256 = "1p7q47fin12vzyf126v1azbbpgpa0y6ighfh6mbfdb6zcyq74kbd"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-10-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.11.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-curl"; - sha256 = "024z5b1achkf448gxqy1i3gcw371x54kfl6igv08b5wb3rrw35a4"; + sha256 = "18pl32rg7zkxgyv1nw9krha0pzq0amcad0jl162jiw81khz4cc85"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hdf5-1.14.3-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hdf5-1.14.5-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-hdf5"; - sha256 = "0pdx082m87j26cz4c2l3kr3yiv360p28qcbw9lz05l8p91jhdvfz"; + sha256 = "1lx87nvrsc0fjcr93k30c4ds64swgwl5vv07058xbgqabil2293f"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.11.0-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.12.1-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-h5py"; - sha256 = "0cxvsv1c3wb0i4s5cd5hz9n67vvqf9b0hk6phj3996nx9finsi2y"; + sha256 = "1vcaadsln7pbwzfbh8svkd5miagxhsx3irr8azz6cb64cyjag9d0"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.15.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.15.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-pyqt5-sip"; - sha256 = "1y0kaw6x1accd3ixd132gwh08i03cg1whih4iyrqz62p5r1905xw"; + sha256 = "1k68xy5lapbi2s7zkxpzz5ps2l9b9yd3kp9w4lh47zk74al74fyj"; }) (pkgs.fetchurl { @@ -265,15 +265,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.43-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.44-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libpng"; - sha256 = "0djnvabj3zpswga0i2k496cgs9m1xy9axc8nb0ag6w647szy77b0"; + sha256 = "1zg1wf37z13szm7x09h2jbr5xpxs137kr812rgkzc80i7h3h6a1x"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-wineditline-2.206-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-wineditline-2.208-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-wineditline"; - sha256 = "0z9kn9mnh3ffl8dmsw3l1hys8k7sn6a2qys08k4cn225jr9nrmzs"; + sha256 = "0x9d1ax81p0k1863z0jdhqg7454hb0svvil1f4aiqy1vlhqshfl5"; }) (pkgs.fetchurl { @@ -283,15 +283,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-24.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-24.2-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-packaging"; - sha256 = "103gjfj7lqy3bgmvl12v7y6szwqk02hs3ribiqxavzk8hswsky6a"; + sha256 = "1m6pcrzpv80mvnsv770da7q71drc5nha636qlsjl5qvfzxi6hgfd"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.80.4-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.82.2-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-glib2"; - sha256 = "0b9cmyvd6h4kfnhry34l8qn42kisirvnpl6wjsmw9j228146dibr"; + sha256 = "0xwsd4l98dyar4359xgvx7s4asd2hyd4d38mh9h820mfza2abczn"; }) (pkgs.fetchurl { @@ -301,15 +301,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-9.0.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-10.1.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-harfbuzz"; - sha256 = "0gza7wynkndnq71fsbshhi48dg0a9ghzz2zkpzyk2cqa69qk5gc2"; + sha256 = "01xi8gw8sppz5cfhazy5kbsk638vw3gppfzfix40gjs7pas7fg9q"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-freetype-2.13.2-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-freetype-2.13.3-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-freetype"; - sha256 = "07kdykdz73jjqajarn1b1wv5mkwnwj7xw09x4iy11gpj6yz0sb8h"; + sha256 = "08jn0qqibkk2s4q005ff0a1kz0yklq0cp7w4wd1g4h2ykczii2zy"; }) (pkgs.fetchurl { @@ -325,9 +325,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.3-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.4-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libjpeg-turbo"; - sha256 = "0n0w3g28xbh1byysivcqxj2qxsjhbqpkvzj6xcyv0z738j2jf951"; + sha256 = "1xq45dhynjx1qynnp75dwii0gzy911i8wrfa2rdarlygvr8dssr7"; }) (pkgs.fetchurl { @@ -337,75 +337,75 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.290.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-vulkan-loader"; - sha256 = "1flqk2wj56a8h4b07vxqcv8s7f4vvfrryr3fl9151y9gl96354vl"; + sha256 = "0nx4586kgavhadbpwlgl287iw3g9nkmf5n6z5pvyyb3ayh760h2s"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.14+kde+r141-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.15+kde+r127-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-qt5-base"; - sha256 = "009paqlkrmfm851vfb7mm4r0qyyx5cglq8k9lxpr9rqx32v0pmgh"; + sha256 = "0hhlr2a7g5h5xzb31jwxw0dfavxg434n33m9ir88vbkhgdq2ig36"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.11-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.11-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-pyqt5"; - sha256 = "16hxc8sn6bszlqf4nmrzm02198jsqd1yx4lb8d1r2c54497flbm8"; + sha256 = "1s20ami7anxja6lrlqaivg1xlcmk2qqzckhfy5r8k10mf25wwrz8"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.14+kde+r5-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.15+kde+r5-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-qt5-svg"; - sha256 = "0di85dzj47200w93ddm2njmhzygz3f77bvan3bj260g7f45i0p1g"; + sha256 = "1cjdchwfbf62w695sa17walj771m4hw3k3mvq1bkx9drvgw51w0c"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-qasync-0.27.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-qasync-0.27.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-qasync"; - sha256 = "075i935vgpdaw59w29w73x6k7bwpdn22bw53pjlia5xkznqmg987"; + sha256 = "17q0qwdkhhjc3b3cq95d2nbjxp1r94dvgqs216fsbj32x4fd275i"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.7-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.7-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-pyqtgraph"; - sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656"; + sha256 = "10w10qxnshba74j7s9n1b7279q6pc5za9h3yk01vdikly20ki8db"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-six-1.16.0-4-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-six-1.16.0-6-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-six"; - sha256 = "1f4f1jk9mrgd0a1xpjxahasbwd2x2kah53jkjfkimif120ynqqdg"; + sha256 = "13ias6gykv1spa3h80316n13yq4ldq6az3h89h656hx2law024g5"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-dateutil-2.9.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-dateutil-2.9.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-dateutil"; - sha256 = "15zbs5jxh2id2hdskprf0p85nh4y1bgngwgbq482hc31nq5gsls1"; + sha256 = "14i6jqkjs0ca9zahsdd6pq7fxci441cfi15dd57l6cd8cy5g3bfm"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-wcwidth-0.2.13-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-wcwidth-0.2.13-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-wcwidth"; - sha256 = "0c1k6kqfgirlm0xqigajbx6fv51v0lm95y1g39w1klij2dq4jk5q"; + sha256 = "1lcp01bsqcnc1rrf9n5s76wxj8d2ascxpd94fy0084bhvjklf17z"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-prettytable-3.10.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-prettytable-3.11.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-prettytable"; - sha256 = "1d0xx49bacqz1b55q8yp13pkfj8yhfsazibk6zlmld5ac7blk6cw"; + sha256 = "0dg1703r0cq2kq0qsnzz0yaqvnsrdg1bdzws2p7rwpm7ddbm4kla"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-colorama-0.4.6-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-colorama-0.4.6-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-colorama"; - sha256 = "10mw2pirqrw3gk28alnk6l29v4b3z3w45xlr8fvzdbpvzhfrwgkn"; + sha256 = "1k1qkaxad25k7c2ybph084c3nbvx0akbv4y078hkav2hff7mdbah"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.66.4-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.67.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-tqdm"; - sha256 = "1f7yh9ld2bx7jy9p391wdbf1j0b3iacn1j7m9sv1c3bs79qx3mf7"; + sha256 = "1x452k3byk8pkh40m0jblim1797vkxby15289vmddnjac4hmmyp8"; }) (pkgs.fetchurl { @@ -415,81 +415,81 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libgit2-1.7.2-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libgit2-1.8.4-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libgit2"; - sha256 = "161ky0l2gljpiphgy0fihw8d6a09ay95v78as60riasmmj6n027j"; + sha256 = "0ffv4cs2m6fkw2g6pnb3h5w47bp71l4q6l5lam3phvbibsa1wmk5"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.22-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.22-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-pycparser"; - sha256 = "1xzkxiz7268r8x1xx5c86879nhg4lfs0xjbbyj1m1673r09jfzbn"; + sha256 = "1f8m0lfv3fhqi4skb440rqfl2lx43bjqg2vg4f9whb0df7n63y8c"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-cffi-1.16.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-cffi-1.17.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-cffi"; - sha256 = "0ymgaaynxsdra8cr10gvym5wgk5c4vjsnwlq4pzy7g55v4gn0piz"; + sha256 = "1pr84r0z1wdmlhimck7pl9qv3g9anhm3896y8yz47f77lp899sb8"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pygit2-1.14.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pygit2-1.16.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-pygit2"; - sha256 = "0wbzlbfcyl4i55xf3chfjpwhwj5jqg4pqv3m5qcslmm573xfyki5"; + sha256 = "0rykskvn8px62ifpcy1qaacln6v6ap5m232fnnp5h34lz88hajkf"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.43.0-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.43.0-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-llvmlite"; - sha256 = "08qicphcnn2lc13ygkvaddal8589x952g9c20m43ybaq2wd1qq8a"; + sha256 = "1hdqgpwbznxyh1z82fzabzlh99kfyii3h7srdl4sdxdw0h476b4i"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rapidfuzz-3.6.2-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rapidfuzz-3.6.2-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-rapidfuzz"; - sha256 = "10mc1h0hcd0mmf9hj0ynl9mfjihliaj0a61q2d087v5fbwf8v0kn"; + sha256 = "017ls3za85rvm8d75wwpnd2cry1xgrlwsqkz0x896q4s8gsfh043"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-levenshtein-0.25.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-levenshtein-0.25.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-levenshtein"; - sha256 = "0bwx8q9lv8i2ax8y5yw7pn5gzp804rqc55ijdkw83my33l1758wa"; + sha256 = "0mgj825a0pygaw8f1almf3sa8nz8npyfjqizga6935lsizxxz19i"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lmdb-0.9.31-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lmdb-0.9.33-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-lmdb"; - sha256 = "1gz4b261klr37xb56kj5ybymrsh6q237wkssmkjg32dy511asbiw"; + sha256 = "0vmih3yhady422c6kpa0mzj1iv7ywd6xawzsz1zv46kcr88ylrsb"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-lmdb-1.4.1-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-lmdb-1.4.1-4-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-lmdb"; - sha256 = "08b8pja1vhh7z0nrccr01qyfpkjqq8400ra0nvhpincwlaw5rcwn"; + sha256 = "0gqgbr7qbhi2pbaxr78ysk3a0zip2jwdwdsdid9ql8sw1i7l572c"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libxml2"; - sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b"; + sha256 = "1b1r5llgqv88id8iwhqh23qwqmn5ic9hdamdc8xzij9hmcvdmmci"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-llvm-libs"; - sha256 = "0rpbgvvinsqflhd3nhfxk0g0yy8j80zzw5yx6573ak0m78a9fa06"; + sha256 = "1djpljwjp346ninpmlxsckkn1s92v85ndv96ny96yg62bf3j6ya3"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-lld"; - sha256 = "1vpij5d06m4kjy3qv8bizwlkl21gcv6fv0r2f1j9bclgm6k3144x"; + sha256 = "1h3ms8c5zn2kglhqk172wkgw7ld80b51rxyhan8044yra10f6lm6"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-llvm"; - sha256 = "185g5h8q3x3rav9lp2njln58ny2idh2067fd02j3nsbik6glshpf"; + sha256 = "0mmibgwxd4ab3hw8hcbnfrb08d8wji3k62x0qs4yhpfgncbxscgf"; }) (pkgs.fetchurl { @@ -517,9 +517,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libftdi-1.5-7-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libftdi-1.5-10-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libftdi"; - sha256 = "1il49b4mqhywgl49h27227xbw96af1wz7kpaawhh4qkym3rxqkzd"; + sha256 = "021ywl40967f565nhspmbcghfmgc59cdjcki3jsrp12i3lil2jjp"; }) (pkgs.fetchurl { @@ -529,9 +529,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.1-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.3-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-capstone"; - sha256 = "1n6540abhq7h7wvabvzg4x69pkkyqzl21jr0lxkr1sf35mq6rai1"; + sha256 = "1pzrwcvdns1npn4nslbkhf42vircncs47qzx178gx8nldf7zzlvy"; }) (pkgs.fetchurl { @@ -547,56 +547,80 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-attrs-23.2.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-attrs-23.2.0-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-attrs"; - sha256 = "0bcmz0b0s18s0pwpkvv6g7hph7bvr9mgyips409kkazw168iikab"; + sha256 = "0mzlrasngafkwp22wg2gb1x3rkvz12szcn7na0vgm74zw4f4k5v9"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-multidict-6.0.5-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rpds-py-0.21.0-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-rpds-py"; + sha256 = "1sqxv0bvfimdpa165ra4xv3d8v73sv6rrc0hm1pazmfb6p8w93p4"; + }) + + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-referencing-0.35.1-2-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-referencing"; + sha256 = "01is7kj3bav4c9hw7y1r97k8l42mi1iypch0p2s40s6yq8fzj5kd"; + }) + + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-jsonschema-specifications-2023.12.1-2-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-jsonschema-specifications"; + sha256 = "04hfiq9y6q7myd1qfbmf7qd910l5rszzm3c3jxgp6zwlii6zhpg3"; + }) + + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-jsonschema-4.22.0-3-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-jsonschema"; + sha256 = "0503d3j2zn3gm6mcgbhx3fi5skvainhc5l259c93hipgckb3vsqc"; + }) + + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-multidict-6.0.5-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-multidict"; - sha256 = "1dx4cxznbih3ijnlmki6x0g8a3q1qg71wmsw7jrd82kwrh31x67i"; + sha256 = "175pxgawkjbi14zyfz8agjaxnxs5a14ifv3dq82ic9g8sb9ydk0j"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.7-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-idna"; - sha256 = "03j5vgnr8g9qspcq8d9wa99bmjnxh05v1pim82xxxy2jpq5vq2a2"; + sha256 = "09qpxm174lqinhxqngy7sirckvvhyzzxr4fcy22jn281mr2n3i9c"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-yarl-1.9.4-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-yarl-1.9.4-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-yarl"; - sha256 = "1n8b0460q526q9w7i53a1jydma81c1sdg9h4ayy030fxx7zsn4id"; + sha256 = "0rh6ijk0glrlvqqg3l18a850mvgmwarzd5g42yxjzms5w7xx9052"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-frozenlist-1.4.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-frozenlist-1.4.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-frozenlist"; - sha256 = "1dny1z3d7ddb01im45fjppvkvxqkpah5dmy8w74y6b21afza4q2a"; + sha256 = "1yr2g5gk9jjsd6gjssd3vf7ybvk7vgpsmzzk2lmy5y4kn04fydcw"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiosignal-1.3.1-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiosignal-1.3.1-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-aiosignal"; - sha256 = "0s4lj5sfal2rd2naab1j1qc1wh7qxc4d7blg3z1gxhx2g2lyqln2"; + sha256 = "09c7h2fywpqrdxkf82jhy9lzkcn6yy2h78hvw6d3x0wk8hqn9n5p"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiohttp-3.9.5-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiohttp-3.9.5-3-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-aiohttp"; - sha256 = "1ykf2djwnsdaxw0lkq8wivrwfwg3h72kdxfkb96n76nim9gcffim"; + sha256 = "03isa78gw491j6lms4qszmabh8d6c20hlxl58r7pgq3zcf5k55cl"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2024.5.15-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2024.9.11-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-regex"; - sha256 = "0abds3p4cbax0qx0vw71ajyjacv5j7hm42qikrij9hj19axzr8an"; + sha256 = "176z3dcy2wwmizqnqz20faimbhck6zrqcwj5am3w4l5wwmf3mxf2"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-4-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-pybase64"; - sha256 = "050yl9bgri00vh4gb08spssdmwssri0492r91dmizkq0inc6m666"; + sha256 = "1gwx81i6pb1c3bnk66qciwb2a0qznvm8jwybaz41d60xirmn603h"; }) ] diff --git a/msys2/comtools_dependencies.txt b/msys2/comtools_dependencies.txt index 6dd15df..9fc75c9 100644 --- a/msys2/comtools_dependencies.txt +++ b/msys2/comtools_dependencies.txt @@ -1,3 +1,3 @@ -mingw-w64-clang-x86_64-python3.11 +mingw-w64-clang-x86_64-python mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-aiohttp diff --git a/msys2/make_msys2_packages.sh b/msys2/make_msys2_packages.sh index d7d4c36..ec8b0f1 100755 --- a/msys2/make_msys2_packages.sh +++ b/msys2/make_msys2_packages.sh @@ -13,7 +13,7 @@ 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-clang-x86_64-cc mingw-w64-clang-x86_64-python3.11 \ + mingw-w64-clang-x86_64-cc mingw-w64-clang-x86_64-python \ 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 \ diff --git a/msys2/msys2_packages.nix b/msys2/msys2_packages.nix index 5f9bce4..b5ea337 100644 --- a/msys2/msys2_packages.nix +++ b/msys2/msys2_packages.nix @@ -1,15 +1,15 @@ { pkgs } : [ (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libunwind"; - sha256 = "1v8zkfcbf1ga2ndpd1j0dwv5s1rassxs2b5pjhcsmqwjcvczba1m"; + sha256 = "0f9m76dx40iy794nfks0360gvjhdg6yngb2lyhwp4xd76rn5081m"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libc++"; - sha256 = "0mfd8wrmgx12j5gf354j7pk1l3lg9ykxvq75xdk3jipsr6hbn846"; + sha256 = "17savj9wys9my2ji7vyba7wwqkvzdjwnkb3k4858wxrjbzbfa6lk"; }) (pkgs.fetchurl { @@ -31,9 +31,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.2-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.3-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-xz"; - sha256 = "0phb9hwqksk1rg29yhwlc7si78zav19c2kac0i841pc7mc2n9gzx"; + sha256 = "09cbqivx9afh7wnqi5iiyrbhnv3y2qc9h1brm420sjpaqhz4prkv"; }) (pkgs.fetchurl { @@ -43,9 +43,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libxml2"; - sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b"; + sha256 = "1b1r5llgqv88id8iwhqh23qwqmn5ic9hdamdc8xzij9hmcvdmmci"; }) (pkgs.fetchurl { @@ -55,69 +55,69 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-llvm-libs"; - sha256 = "0rpbgvvinsqflhd3nhfxk0g0yy8j80zzw5yx6573ak0m78a9fa06"; + sha256 = "1djpljwjp346ninpmlxsckkn1s92v85ndv96ny96yg62bf3j6ya3"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-llvm"; - sha256 = "185g5h8q3x3rav9lp2njln58ny2idh2067fd02j3nsbik6glshpf"; + sha256 = "0mmibgwxd4ab3hw8hcbnfrb08d8wji3k62x0qs4yhpfgncbxscgf"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-clang-libs"; - sha256 = "089hji3yd7wsd03v9mdfgc99l5k1dql8kg7p3hy13vrbgfsabxhc"; + sha256 = "1g17j8qlwpwbdil70vygmqm5slcshcgafav920ziaym5m36kgw57"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-compiler-rt"; - sha256 = "1dwcxnv1k5ljim5ys4h1c3jlrdpi0054z094ynav7if65i8zjj4a"; + sha256 = "14nh1dm6lxf3jfi88zfcq5m5sw7s191pdz1623d5h46sa7f8ijj8"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r386.gc6857dc97-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-headers-git"; - sha256 = "1h3cdcajz29iq7vja908kkijz1vb9xn0f7w1lw1ima0q0zhinv4q"; + sha256 = "1163w12g47hys2wd7454hxr0555yps3np949cr43gfqrxjq7l61x"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r386.gc6857dc97-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-crt-git"; - sha256 = "15kamyi3b0j6f5zxin4i2jgzjc7lzvwl4z5cz3dx0i8hg91aq0n7"; + sha256 = "0rq3sb91042wcyk8z7szmrhxc6hrx5gxl2z0y0szwpclnngdw1mn"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-lld"; - sha256 = "1vpij5d06m4kjy3qv8bizwlkl21gcv6fv0r2f1j9bclgm6k3144x"; + sha256 = "1h3ms8c5zn2kglhqk172wkgw7ld80b51rxyhan8044yra10f6lm6"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r386.gc6857dc97-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libwinpthread-git"; - sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb"; + sha256 = "0r5rxcabg09023llyim59w0vcpn8ycx53v9acln4gpjxcgn3b96c"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r386.gc6857dc97-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-winpthreads-git"; - sha256 = "0rh2mn078cifcmr4as4k57jxjln5lbnsmpx47h9d0s5d2i8sf2rc"; + sha256 = "105iidkxbnxq2ac74z7wqvscwc87wr63mphx7nn5q3p712295lh4"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.8-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.8-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-clang"; - sha256 = "1qny934nv4g75k9gb5sf31v24bgafkg6qw7r35xv3in491w6annq"; + sha256 = "18p6sgmcycbzr4v3agsfqf3hdz5xgqhd53266blmnwh8xvcsi2dr"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.4-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-expat"; - sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38"; + sha256 = "03fp2yacv7gk0g049lffz6pbj93vpjmzqxxa312d4gxczi57nqdv"; }) (pkgs.fetchurl { @@ -133,27 +133,27 @@ }) (pkgs.fetchurl { - 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"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-0.9.0-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-libtre"; + sha256 = "1y5d2cbkpd0ngqlsv6hvz47nxb1wry33i5s1clg2k53yhgjkg8vv"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-6-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libsystre"; - sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq"; + sha256 = "19c71fs5gqjrf88mv7l702fjg228xd9lfbxg0mkzm3ljvv4ljn0q"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.5.20240831-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-ncurses"; - sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza"; + sha256 = "1hlfj9g4s767s502sawwbcv4a0xd3ym3ip4jswmhq48wh5050iyb"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.4.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-openssl"; - sha256 = "0ywhwm4kw3qjzv0872qwabnsq2rzbmqjb9m69q3fykjl0m9gigsa"; + sha256 = "0cgiqjmgdnwnv9r88z634dmqrzh06dmsfncyzymw0s16nnv2k7k2"; }) (pkgs.fetchurl { @@ -163,9 +163,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-readline"; - sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; + sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr"; }) (pkgs.fetchurl { @@ -175,9 +175,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-sqlite3"; - sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; + sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq"; }) (pkgs.fetchurl { @@ -187,15 +187,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024b-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-tzdata"; - sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji"; + sha256 = "0jihnr1i7vyzczxz60ds1x3gcm3p4ad2pq9d5vvpwjdwrxkvxmkc"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.12.7-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python"; - sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c"; + sha256 = "1c71xm6dp700qw1vzwy97bqk5093yhhzvk8p498z2zdn92s1dxj9"; }) (pkgs.fetchurl { @@ -205,20 +205,20 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-openblas"; - sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; + sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-2.1.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-numpy"; - sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; + sha256 = "1kiy7ail04ias47xbbhl9vpsz02g0g3f29ncgx5gcks9vgqldp6m"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-70.2.0-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-75.3.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-python-setuptools"; - sha256 = "1d2l3bnbmhl0a2an9fpwa83hbsm7szfxjr9vg8df45cnwgpxrxjb"; + sha256 = "1cph081zr7m0qp66b9v2zq69a9inavbzvwgwx4mmzklnpbrly5yv"; }) ] diff --git a/msys2/sipyco_dependencies.txt b/msys2/sipyco_dependencies.txt index a33a5e6..f25900e 100644 --- a/msys2/sipyco_dependencies.txt +++ b/msys2/sipyco_dependencies.txt @@ -1,3 +1,3 @@ -mingw-w64-clang-x86_64-python3.11 +mingw-w64-clang-x86_64-python3 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-pybase64 -- 2.44.2