From 1e64b5786c6c9e8d0b1bb8fc41b1afe1a1d4782f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 27 Jul 2024 22:19:14 +0800 Subject: [PATCH] msys2: update, qt6 --- msys2/artiq_dependency_packages.nix | 62 ++++++++++++++++------------- msys2/msys2_packages.nix | 4 +- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/msys2/artiq_dependency_packages.nix b/msys2/artiq_dependency_packages.nix index c02f560..3c39c62 100644 --- a/msys2/artiq_dependency_packages.nix +++ b/msys2/artiq_dependency_packages.nix @@ -229,9 +229,9 @@ }) (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.9.0-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-curl"; - sha256 = "024z5b1achkf448gxqy1i3gcw371x54kfl6igv08b5wb3rrw35a4"; + sha256 = "0nnn3pj9l8k66ifi7pxrg6n1fhisdj4klqxnd0xiq8njdbx8f61m"; }) (pkgs.fetchurl { @@ -247,15 +247,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.15.0-1-any.pkg.tar.zst"; - name = "mingw-w64-clang-x86_64-pyqt5-sip"; - sha256 = "1y0kaw6x1accd3ixd132gwh08i03cg1whih4iyrqz62p5r1905xw"; - }) - - (pkgs.fetchurl { - 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"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-sip-13.8.0-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-pyqt6-sip"; + sha256 = "09q4q4kjkyyyf5gn4lili94rz2fqlh8mh022qqwnscfxd5bm6haa"; }) (pkgs.fetchurl { @@ -264,6 +258,12 @@ sha256 = "1jd07myjvc0dzwkh84rk7c74wv96syyfb7v99694bbbv31jkqw4g"; }) + (pkgs.fetchurl { + 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/clang64/mingw-w64-clang-x86_64-libpng-1.6.43-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libpng"; @@ -312,18 +312,18 @@ sha256 = "07kdykdz73jjqajarn1b1wv5mkwnwj7xw09x4iy11gpj6yz0sb8h"; }) - (pkgs.fetchurl { - 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/clang64/mingw-w64-clang-x86_64-icu-75.1-2-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-icu"; sha256 = "0dxskyhbqgiphlz95b7hp05kcryaspa045ad8763m903nnslq7ri"; }) + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libb2-0.98.1-2-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-libb2"; + sha256 = "0555dvb2xs6695sz5ndrx6y0cz3qa5cg0m5v8q1md13ssg76vlh6"; + }) + (pkgs.fetchurl { url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.3-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libjpeg-turbo"; @@ -343,21 +343,27 @@ }) (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"; - name = "mingw-w64-clang-x86_64-qt5-base"; - sha256 = "009paqlkrmfm851vfb7mm4r0qyyx5cglq8k9lxpr9rqx32v0pmgh"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-headers-1.3.290.0-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-vulkan-headers"; + sha256 = "0zk06zpwpg7ihrwfx402zlmgbhjzwwcynn56w2yggxa1bq3giy6h"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.11-1-any.pkg.tar.zst"; - name = "mingw-w64-clang-x86_64-python-pyqt5"; - sha256 = "16hxc8sn6bszlqf4nmrzm02198jsqd1yx4lb8d1r2c54497flbm8"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-base-6.7.2-2-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-qt6-base"; + sha256 = "0q0rm0ng9qsdd997n1ra1ag8s072f2fmagfhw4h3n1d0prhfn5m3"; }) (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"; - name = "mingw-w64-clang-x86_64-qt5-svg"; - sha256 = "0di85dzj47200w93ddm2njmhzygz3f77bvan3bj260g7f45i0p1g"; + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-6.7.1-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-python-pyqt6"; + sha256 = "0651vffjrdmhgzylci1c2lz88wb4ngij064bliwjrjm2v6jxbyf9"; + }) + + (pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-svg-6.7.2-1-any.pkg.tar.zst"; + name = "mingw-w64-clang-x86_64-qt6-svg"; + sha256 = "0rn5m3yf4r42cllwzl60hmscggzmbxc0mgaisjn8dwlrakv211v5"; }) (pkgs.fetchurl { @@ -469,9 +475,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-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libxml2"; - sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b"; + sha256 = "0cjz2vj9yz6k5xj601cp0yk631rrr0z94ciamwqrvclb0yhakf25"; }) (pkgs.fetchurl { diff --git a/msys2/msys2_packages.nix b/msys2/msys2_packages.nix index 5f9bce4..18f147a 100644 --- a/msys2/msys2_packages.nix +++ b/msys2/msys2_packages.nix @@ -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-1-any.pkg.tar.zst"; name = "mingw-w64-clang-x86_64-libxml2"; - sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b"; + sha256 = "0cjz2vj9yz6k5xj601cp0yk631rrr0z94ciamwqrvclb0yhakf25"; }) (pkgs.fetchurl {