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

Compare commits

merge into: M-Labs:master
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
fsagbuya:platformdirs
fsagbuya:omit_scipy_8
fsagbuya:omit_scipy
fsagbuya:update_2-15-24
fsagbuya:master
fsagbuya:release-7
...
pull from: fsagbuya:omit_scipy_8
Branches Tags
fsagbuya:platformdirs
fsagbuya:omit_scipy_8
fsagbuya:omit_scipy
fsagbuya:update_2-15-24
fsagbuya:master
fsagbuya:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7

8 Commits
master ... omit_scipy

Author SHA1 Message Date
Florian Agbuya
763df7d869 msys2: update 2024-07-26 18:51:21 +08:00
Florian Agbuya
85173d4e70 remove scipy from artiq dependencies 2024-07-26 18:50:58 +08:00
Egor Savkin
5e1fcbdce2 Update flake and msys2 packages 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-07-15 15:30:10 +08:00
Sebastien Bourdeauducq
32e512e10d flake: update dependencies 2024-07-10 10:43:58 +02:00
Sebastien Bourdeauducq
8cf0c2a2dd flake: update dependencies 2024-06-19 12:48:55 +08:00
Sebastien Bourdeauducq
deebcb2af3 flake: update dependencies 2024-06-06 13:55:10 +08:00
Egor Savkin
be72649af9 Follow stable branch for release-8 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-06-06 12:01:07 +08:00
Sebastien Bourdeauducq
08e013d8cc flake: follow ARTIQ release-8 2024-06-06 10:21:58 +08:00
6 changed files with 115 additions and 127 deletions
Show Stats Expand all files Collapse all files

31
flake.lock generated
View File

@ -66,15 +66,16 @@
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1717638354,
"narHash": "sha256-eyI8OsOrn/j8ChbCpyFpS5VXBW8xSNGGIboFGQj/d4I=",
"ref": "refs/heads/master",
"rev": "ebc1e3fb767d6c0eac6eac20c3afeaba2ab70d1a",
"revCount": 8833,
"lastModified": 1721012880,
"narHash": "sha256-jraN3SJzyjn4AZAmj8Kxj1ggFkZDZiWrGcJdoxxA+fE=",
"ref": "release-8",
"rev": "86a8d2d87a20d0f650deccb191de70f85b4b62fc",
"revCount": 8892,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
"original": {
"ref": "release-8",
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
}
@ -97,11 +98,11 @@
"trap-dac-utils": "trap-dac-utils"
},
"locked": {
"lastModified": 1716922507,
"narHash": "sha256-C2bX34vzePyegeQK6eezU2IWJJFnUiugNZyVSg+qE5c=",
"lastModified": 1718043213,
"narHash": "sha256-pnFYB2xf4tO1eDzLJuXh4YzHxLFt+STDE25Y2RyTArU=",
"ref": "refs/heads/master",
"rev": "1331053e5ae1e468bcdccb724bf069e447542ae6",
"revCount": 1334,
"rev": "25d6175a617a81eeecc09459e425eb5edf23eb6d",
"revCount": 1343,
"type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git"
},
@ -204,11 +205,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717281328,
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
@ -248,11 +249,11 @@
"src-migen": {
"flake": false,
"locked": {
"lastModified": 1715484909,
"narHash": "sha256-4DCHBUBfc/VA+7NW2Hr0+JP4NnKPru2uVJyZjCCk0Ws=",
"lastModified": 1720332047,
"narHash": "sha256-FdYVEHVtXHrzPhBqpXOTo9uHQAtuCsDPmAPY8JrfHOY=",
"owner": "m-labs",
"repo": "migen",
"rev": "4790bb577681a8c3a8d226bc196a4e5deb39e4df",
"rev": "60739a161e64630ce7ba62d1a5bac1252b66c3b9",
"type": "github"
},
"original": {

4
flake.nix
View File

@ -1,7 +1,7 @@
{
description = "Additional packages for ARTIQ";
inputs.artiqpkgs.url = git+https://github.com/m-labs/artiq.git;
inputs.artiqpkgs.url = git+https://github.com/m-labs/artiq.git?ref=release-8;
inputs.daxpkgs = {
url = git+https://gitlab.com/duke-artiq/dax.git;
@ -543,7 +543,7 @@
mkdir $out
mkdir -p tmp/cache
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
printf "\n[artiq]\nSigLevel = Optional TrustAll\nServer = https://msys2.m-labs.hk/artiq\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; /\[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)}

1
msys2/artiq_dependencies.txt
View File

@ -5,7 +5,6 @@ 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

140
msys2/artiq_dependency_packages.nix
View File

@ -1,15 +1,15 @@
{ pkgs } : [
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libunwind";
sha256 = "1krbm0ysv5qg3g2y5zj0wfqy8n1ni6pfqpv57xp8bbzrai16hrbs";
sha256 = "1v8zkfcbf1ga2ndpd1j0dwv5s1rassxs2b5pjhcsmqwjcvczba1m";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libc++";
sha256 = "1msgipk6x6pn5ji9iykgz6cm7cm1a2fmvpa8k5m76xk78ijb6cmj";
sha256 = "0mfd8wrmgx12j5gf354j7pk1l3lg9ykxvq75xdk3jipsr6hbn846";
})
(pkgs.fetchurl {
@ -127,15 +127,15 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0yqrzvnqs8zr6whazp9q4r74viq0440ikvql92zj5zg9yzm507zl";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-openmp";
sha256 = "0zqxln0f7hsv4zw70br7jzank9flrf5aj2vvf5kndq24x22avzng";
sha256 = "0cy2v0l4af24j34mzj5q5nlzcqhackfajlfj1rpf6mb3rbz23qw9";
})
(pkgs.fetchurl {
@ -145,9 +145,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c";
})
(pkgs.fetchurl {
@ -163,9 +163,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-brotli";
sha256 = "113mha41q53cx0hw13cq1xdf7zbsd58sh8cl1cd7xzg1q69n60w2";
sha256 = "1q01lz9lcyrjmkhv9rddgjazmk7warlcmwhc4qkq9y6h0yfsb71n";
})
(pkgs.fetchurl {
@ -199,9 +199,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-p11-kit-0.25.3-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-p11-kit-0.25.5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-p11-kit";
sha256 = "1jrwkc4lvw5hm5rqmi5gqh7mfkbqfa5gi81zjij0krnl0gaxw3c8";
sha256 = "00yz6cmr1ldlrskv811n345xcia88mj7w4fyx4m9z5848jxgsabd";
})
(pkgs.fetchurl {
@ -223,15 +223,15 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.3.0-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.4.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-nghttp3";
sha256 = "0db177mgvd9lgyki5f27a095ghkx51bvscjslaj4phf9ggg82731";
sha256 = "007w2252nzn274j4wjc1vf56xyzzh5vg3blj1hil7mlmffgvc923";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-8-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-10-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-curl";
sha256 = "1l40fvbryl76lb5lxwpsz6b2sdmqq543w5km4mpxp3immrw1s6hs";
sha256 = "024z5b1achkf448gxqy1i3gcw371x54kfl6igv08b5wb3rrw35a4";
})
(pkgs.fetchurl {
@ -241,15 +241,15 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.11.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.11.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-h5py";
sha256 = "0lscn9gdsnichylqkl93vdzw3j1l87hg32ijk7kig7dx4xr8rf72";
sha256 = "0cxvsv1c3wb0i4s5cd5hz9n67vvqf9b0hk6phj3996nx9finsi2y";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.13.0-2-any.pkg.tar.zst";
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 = "1100zd3xz7g7pf3z11pqj9cvzpap7yz4q58gnq5yaky51s1246h7";
sha256 = "1y0kaw6x1accd3ixd132gwh08i03cg1whih4iyrqz62p5r1905xw";
})
(pkgs.fetchurl {
@ -277,21 +277,21 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pcre2-10.43-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pcre2-10.44-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-pcre2";
sha256 = "0jrgk5afqg6czjp64a74mylfghsfrx1vrbb85ibs7qssks7h6x7k";
sha256 = "0cfrvrjg4k28pg5qvh94had5k3y3lr7hy8j4v4pr9y8dqws14a13";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-23.2-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-24.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-packaging";
sha256 = "0zr7i0pmj0a8m41kvr973i6hc3yjv2jxxbwp4hzwml6ynjfpb1c8";
sha256 = "103gjfj7lqy3bgmvl12v7y6szwqk02hs3ribiqxavzk8hswsky6a";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.80.2-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.80.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-glib2";
sha256 = "1wrb1zp0c5zbgzvy0d9kj8j6mivb81v548dw6wiij8ij7fd2m6fx";
sha256 = "0b9cmyvd6h4kfnhry34l8qn42kisirvnpl6wjsmw9j228146dibr";
})
(pkgs.fetchurl {
@ -301,9 +301,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-8.5.0-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-9.0.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-harfbuzz";
sha256 = "1sj4lhl3gdvr2x48z1dhhcgv12d480i4ivmmbr1ymgp37wim4sx3";
sha256 = "0gza7wynkndnq71fsbshhi48dg0a9ghzz2zkpzyk2cqa69qk5gc2";
})
(pkgs.fetchurl {
@ -319,9 +319,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-icu-75.1-1-any.pkg.tar.zst";
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 = "08dx68nrm3cam1nwpqvbnd27rvjr9s17dlgd7xwvq8v9hs6ky5bm";
sha256 = "0dxskyhbqgiphlz95b7hp05kcryaspa045ad8763m903nnslq7ri";
})
(pkgs.fetchurl {
@ -337,27 +337,27 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.283.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.290.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-loader";
sha256 = "1mfniiqslxcrz656jf1wnfiidzwicwi77hdraxmqjq9ljgkzv454";
sha256 = "1flqk2wj56a8h4b07vxqcv8s7f4vvfrryr3fl9151y9gl96354vl";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.13+kde+r145-2-any.pkg.tar.zst";
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 = "1n2w3q9avrbrc94ps57mg59hhaszcknxlmij7bl0ap8942l8ndm5";
sha256 = "009paqlkrmfm851vfb7mm4r0qyyx5cglq8k9lxpr9rqx32v0pmgh";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.10-2-any.pkg.tar.zst";
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 = "07pccsnbsfaa3zdkc7xbd7nklphdfkqdsi1yd84dxdsxprmp808a";
sha256 = "16hxc8sn6bszlqf4nmrzm02198jsqd1yx4lb8d1r2c54497flbm8";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.13+kde+r6-1-any.pkg.tar.zst";
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 = "0camszb46c097vs7xf4kvk9zydkbpjcm0sqm62fa4n5wlvr1zg8n";
sha256 = "0di85dzj47200w93ddm2njmhzygz3f77bvan3bj260g7f45i0p1g";
})
(pkgs.fetchurl {
@ -367,15 +367,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.3-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.7-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqtgraph";
sha256 = "0kai3cpi7pbfkxp7npmz28s78jqcf1aslgz4hfara9698xg6kny6";
})
(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";
sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656";
})
(pkgs.fetchurl {
@ -409,9 +403,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.66.2-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.66.4-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-tqdm";
sha256 = "1ag9wr3xpq63naa2c45lz3csvwkkq8plxf0ajxfbb2chh67jspwq";
sha256 = "1f7yh9ld2bx7jy9p391wdbf1j0b3iacn1j7m9sv1c3bs79qx3mf7";
})
(pkgs.fetchurl {
@ -427,15 +421,9 @@
})
(pkgs.fetchurl {
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/clang64/mingw-w64-clang-x86_64-python-pycparser-2.21-3-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.22-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pycparser";
sha256 = "0qnjqlqz1qbklhyl65whxfm2l6p1imrjqc7kpqc1rx92fm59pbp8";
sha256 = "1xzkxiz7268r8x1xx5c86879nhg4lfs0xjbbyj1m1673r09jfzbn";
})
(pkgs.fetchurl {
@ -451,9 +439,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.42.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.43.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-llvmlite";
sha256 = "0qw88ickp41jvgxvf1dfhn5yz7zsn9q51ra3m522hx1lbqixgn8z";
sha256 = "08qicphcnn2lc13ygkvaddal8589x952g9c20m43ybaq2wd1qq8a";
})
(pkgs.fetchurl {
@ -481,27 +469,27 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh";
sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-libs";
sha256 = "1i8v57pnll233r6c0aypp1niyhin550i4am2fa8spsgxhjzlapq0";
sha256 = "0rpbgvvinsqflhd3nhfxk0g0yy8j80zzw5yx6573ak0m78a9fa06";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-lld";
sha256 = "11a5p3d0m9n52dqvgjs9sai4w7qmnqp943jncnp0nn3w5iff3w6z";
sha256 = "1vpij5d06m4kjy3qv8bizwlkl21gcv6fv0r2f1j9bclgm6k3144x";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm";
sha256 = "1v6v725sxifnvfrfsabv7qiw3nm9j14y14aw7wl92338mbw1nd3z";
sha256 = "185g5h8q3x3rav9lp2njln58ny2idh2067fd02j3nsbik6glshpf";
})
(pkgs.fetchurl {
@ -541,9 +529,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.1-2-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.1-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-capstone";
sha256 = "0xdg50a43jjqqy63x69ns25blk6vz93lylj27cd78f6fcda75hpg";
sha256 = "1n6540abhq7h7wvabvzg4x69pkkyqzl21jr0lxkr1sf35mq6rai1";
})
(pkgs.fetchurl {
@ -571,9 +559,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.7-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-idna";
sha256 = "11wyiz1iad9q5smd42dprymw2670c5swqbigpj2v30zs6nhkabnm";
sha256 = "03j5vgnr8g9qspcq8d9wa99bmjnxh05v1pim82xxxy2jpq5vq2a2";
})
(pkgs.fetchurl {
@ -601,14 +589,14 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2023.12.25-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2024.5.15-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-regex";
sha256 = "1wy6hicjnawh4265wkjpw95l1ji2ggx2z7f6a7wl3flm74fn47nw";
sha256 = "0abds3p4cbax0qx0vw71ajyjacv5j7hm42qikrij9hj19axzr8an";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pybase64";
sha256 = "0cj217d6xcagxismbwncdfy4px1l2axpn6h9zy3bwkh3bwywssk9";
sha256 = "050yl9bgri00vh4gb08spssdmwssri0492r91dmizkq0inc6m666";
})
]

2
msys2/make_msys2_packages.sh
View File

@ -6,7 +6,7 @@ cd $(dirname $0)
MSYS2DIR=`pwd`/msys2
mkdir -p $MSYS2DIR/var/lib/pacman $MSYS2DIR/msys/etc
curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240210-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | \
sed -e "s|/etc/pacman.d|$MSYS2DIR/etc/pacman.d|g" -e "s|SigLevel = Required|SigLevel = Never|g" > $MSYS2DIR/etc/pacman.conf

64
msys2/msys2_packages.nix
View File

@ -1,15 +1,15 @@
{ pkgs } : [
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libunwind";
sha256 = "1krbm0ysv5qg3g2y5zj0wfqy8n1ni6pfqpv57xp8bbzrai16hrbs";
sha256 = "1v8zkfcbf1ga2ndpd1j0dwv5s1rassxs2b5pjhcsmqwjcvczba1m";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libc++";
sha256 = "1msgipk6x6pn5ji9iykgz6cm7cm1a2fmvpa8k5m76xk78ijb6cmj";
sha256 = "0mfd8wrmgx12j5gf354j7pk1l3lg9ykxvq75xdk3jipsr6hbn846";
})
(pkgs.fetchurl {
@ -43,9 +43,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh";
sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b";
})
(pkgs.fetchurl {
@ -55,63 +55,63 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-libs";
sha256 = "1i8v57pnll233r6c0aypp1niyhin550i4am2fa8spsgxhjzlapq0";
sha256 = "0rpbgvvinsqflhd3nhfxk0g0yy8j80zzw5yx6573ak0m78a9fa06";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm";
sha256 = "1v6v725sxifnvfrfsabv7qiw3nm9j14y14aw7wl92338mbw1nd3z";
sha256 = "185g5h8q3x3rav9lp2njln58ny2idh2067fd02j3nsbik6glshpf";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-clang-libs";
sha256 = "1czvclkbdh8gaqcjylwkyplckyqyfzvbvw155cra8ix17nqf8bna";
sha256 = "089hji3yd7wsd03v9mdfgc99l5k1dql8kg7p3hy13vrbgfsabxhc";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-compiler-rt";
sha256 = "1c95vr6940jafgp3kf2530wd675cxgk1iwryhm371i5k9lx6m6n4";
sha256 = "1dwcxnv1k5ljim5ys4h1c3jlrdpi0054z094ynav7if65i8zjj4a";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-headers-git";
sha256 = "02awrl51w0s38ghad0gy201qyxllbh15hkw1kkd7pdc89lmv0kyf";
sha256 = "1h3cdcajz29iq7vja908kkijz1vb9xn0f7w1lw1ima0q0zhinv4q";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-crt-git";
sha256 = "0wxr57ls7lx05s38r5p4a6w27l98knq9fmf8a54cicmfkaw2nk2n";
sha256 = "15kamyi3b0j6f5zxin4i2jgzjc7lzvwl4z5cz3dx0i8hg91aq0n7";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-lld";
sha256 = "11a5p3d0m9n52dqvgjs9sai4w7qmnqp943jncnp0nn3w5iff3w6z";
sha256 = "1vpij5d06m4kjy3qv8bizwlkl21gcv6fv0r2f1j9bclgm6k3144x";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0yqrzvnqs8zr6whazp9q4r74viq0440ikvql92zj5zg9yzm507zl";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-winpthreads-git";
sha256 = "1rd5dg8qqyw48m7fhlm0d0fqhlska3aycrjd0ncw0b25gj7d3ml5";
sha256 = "0rh2mn078cifcmr4as4k57jxjln5lbnsmpx47h9d0s5d2i8sf2rc";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-clang";
sha256 = "15kd2l7hkap9vs1z25zs2dr8bl2hv9m2761xj1ny0michkwpq96b";
sha256 = "1qny934nv4g75k9gb5sf31v24bgafkg6qw7r35xv3in491w6annq";
})
(pkgs.fetchurl {
@ -199,9 +199,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.6-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-openmp";
sha256 = "0zqxln0f7hsv4zw70br7jzank9flrf5aj2vvf5kndq24x22avzng";
sha256 = "0cy2v0l4af24j34mzj5q5nlzcqhackfajlfj1rpf6mb3rbz23qw9";
})
(pkgs.fetchurl {
@ -211,14 +211,14 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-69.1.1-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-70.2.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-setuptools";
sha256 = "1mc56anasj0v92nlg84m3pa7dbqgjakxw0b4ibqlrr9cq0xzsg4b";
sha256 = "1d2l3bnbmhl0a2an9fpwa83hbsm7szfxjr9vg8df45cnwgpxrxjb";
})
]