M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: M-Labs:5b4560d8ca9cddcf3e59d3771cb500f79e88e274
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
..
compare: M-Labs:7ffe3dcf22ccd24ee5f6f15aaca91e66ce0bb75a
Branches Tags
M-Labs:release-8
M-Labs:master
M-Labs:release-7

No commits in common. "5b4560d8ca9cddcf3e59d3771cb500f79e88e274" and "7ffe3dcf22ccd24ee5f6f15aaca91e66ce0bb75a" have entirely different histories.
5b4560d8ca ... 7ffe3dcf22

3 changed files with 29 additions and 22 deletions
Show Stats Expand all files Collapse all files

1
msys2/artiq_dependencies.txt
View File

@ -5,6 +5,7 @@ mingw-w64-clang-x86_64-qt5-svg
mingw-w64-clang-x86_64-python-qasync mingw-w64-clang-x86_64-python-qasync
mingw-w64-clang-x86_64-python-pyqtgraph mingw-w64-clang-x86_64-python-pyqtgraph
mingw-w64-clang-x86_64-python-numpy 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-dateutil
mingw-w64-clang-x86_64-python-prettytable mingw-w64-clang-x86_64-python-prettytable
mingw-w64-clang-x86_64-python-tqdm mingw-w64-clang-x86_64-python-tqdm

42
msys2/artiq_dependency_packages.nix
View File

@ -145,9 +145,9 @@
}) })
(pkgs.fetchurl { (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-1.26.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -163,9 +163,9 @@
}) })
(pkgs.fetchurl { (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-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-brotli"; name = "mingw-w64-clang-x86_64-brotli";
sha256 = "1q01lz9lcyrjmkhv9rddgjazmk7warlcmwhc4qkq9y6h0yfsb71n"; sha256 = "113mha41q53cx0hw13cq1xdf7zbsd58sh8cl1cd7xzg1q69n60w2";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -247,9 +247,9 @@
}) })
(pkgs.fetchurl { (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.13.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-pyqt5-sip"; name = "mingw-w64-clang-x86_64-pyqt5-sip";
sha256 = "1y0kaw6x1accd3ixd132gwh08i03cg1whih4iyrqz62p5r1905xw"; sha256 = "1100zd3xz7g7pf3z11pqj9cvzpap7yz4q58gnq5yaky51s1246h7";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -337,21 +337,21 @@
}) })
(pkgs.fetchurl { (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.283.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-loader"; name = "mingw-w64-clang-x86_64-vulkan-loader";
sha256 = "1flqk2wj56a8h4b07vxqcv8s7f4vvfrryr3fl9151y9gl96354vl"; sha256 = "1mfniiqslxcrz656jf1wnfiidzwicwi77hdraxmqjq9ljgkzv454";
}) })
(pkgs.fetchurl { (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.14+kde+r141-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt5-base"; name = "mingw-w64-clang-x86_64-qt5-base";
sha256 = "009paqlkrmfm851vfb7mm4r0qyyx5cglq8k9lxpr9rqx32v0pmgh"; sha256 = "0axvsyj6maflplq4i3mbrd03jb8syc1hx3m4gf7g5iqbx0c15f4g";
}) })
(pkgs.fetchurl { (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.10-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqt5"; name = "mingw-w64-clang-x86_64-python-pyqt5";
sha256 = "16hxc8sn6bszlqf4nmrzm02198jsqd1yx4lb8d1r2c54497flbm8"; sha256 = "07pccsnbsfaa3zdkc7xbd7nklphdfkqdsi1yd84dxdsxprmp808a";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -372,6 +372,12 @@
sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656"; sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656";
}) })
(pkgs.fetchurl {
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 { (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-4-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-six"; name = "mingw-w64-clang-x86_64-python-six";
@ -403,9 +409,9 @@
}) })
(pkgs.fetchurl { (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.66.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-tqdm"; name = "mingw-w64-clang-x86_64-python-tqdm";
sha256 = "1f7yh9ld2bx7jy9p391wdbf1j0b3iacn1j7m9sv1c3bs79qx3mf7"; sha256 = "1qiph66r7jaz551ykd0j8jqxcvhb3wiynr2k32w2b5hgbnrclvp2";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -529,9 +535,9 @@
}) })
(pkgs.fetchurl { (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.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-capstone"; name = "mingw-w64-clang-x86_64-capstone";
sha256 = "1n6540abhq7h7wvabvzg4x69pkkyqzl21jr0lxkr1sf35mq6rai1"; sha256 = "0xdg50a43jjqqy63x69ns25blk6vz93lylj27cd78f6fcda75hpg";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -595,8 +601,8 @@
}) })
(pkgs.fetchurl { (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-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pybase64"; name = "mingw-w64-clang-x86_64-python-pybase64";
sha256 = "050yl9bgri00vh4gb08spssdmwssri0492r91dmizkq0inc6m666"; sha256 = "0cj217d6xcagxismbwncdfy4px1l2axpn6h9zy3bwkh3bwywssk9";
}) })
] ]

8
msys2/msys2_packages.nix
View File

@ -211,14 +211,14 @@
}) })
(pkgs.fetchurl { (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-1.26.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
}) })
(pkgs.fetchurl { (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-70.2.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-setuptools"; name = "mingw-w64-clang-x86_64-python-setuptools";
sha256 = "1d2l3bnbmhl0a2an9fpwa83hbsm7szfxjr9vg8df45cnwgpxrxjb"; sha256 = "1q4r9bg2hn3jmshvq81xm5zvy9wn35yf0z2ayksrkwph1zzdkvkm";
}) })
] ]