esavkin
/
artiq-extrapkg
forked from M-Labs/artiq-extrapkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: esavkin:eac0d077de0cf8571e80e0b140210090a1686884
Branches Tags
esavkin:master
esavkin:func-args
esavkin:fix-cacerts-and-package
esavkin:fix-msys2-package
esavkin:update-llvm15
esavkin:release-8
esavkin:2428-zadig
esavkin:2316-move-to-clang
esavkin:14-msys2-artiq
esavkin:2289-offline-installer
esavkin:2316-add-llvm
esavkin:python-lmdb
esavkin:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7
..
compare: esavkin:bc345b56570896d2aa68c125eee30befcd186dc0
Branches Tags
esavkin:func-args
esavkin:fix-cacerts-and-package
esavkin:fix-msys2-package
esavkin:update-llvm15
esavkin:release-8
esavkin:2428-zadig
esavkin:2316-move-to-clang
esavkin:14-msys2-artiq
esavkin:2289-offline-installer
esavkin:2316-add-llvm
esavkin:python-lmdb
esavkin:release-7
esavkin:master
M-Labs:master
M-Labs:release-8
M-Labs:release-7

6 Commits
eac0d077de ... bc345b5657

Author SHA1 Message Date
Egor Savkin bc345b5657 Change named arguments to positional 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-09-30 12:55:20 +08:00
Sebastien Bourdeauducq b12ca4b928 msys2/asyncserial: add missing pyserial dependency 2024-09-26 07:47:19 +08:00
Florian Agbuya 1702341f28 msys2: update 2024-08-27 16:18:30 +08:00
Florian Agbuya c249e6af78 msys2: add platformdirs dependency 2024-08-27 15:56:58 +08:00
Florian Agbuya 63f34fbf0c conda: add platformdirs dependency 2024-08-27 15:55:26 +08:00
Egor Savkin 1002e0437a msys2: fix afws client certs 
Co-authored-by: Egor Savkin <es@m-labs.hk>
Co-committed-by: Egor Savkin <es@m-labs.hk>
 2024-08-15 18:35:54 +08:00
5 changed files with 66 additions and 52 deletions
Show Stats Expand all files Collapse all files

7
flake.nix
View File

@ -334,6 +334,7 @@
"tqdm"
"python-lmdb"
"artiq-comtools"
"platformdirs"
];
}
@ -433,7 +434,7 @@
name = "python-asyncserial";
version = artiqpkgs.packages.x86_64-linux.asyncserial.version;
src = artiqpkgs.packages.x86_64-linux.asyncserial.src;
depends = [ "mingw-w64-clang-x86_64-python" ];
depends = [ "mingw-w64-clang-x86_64-python" "mingw-w64-clang-x86_64-python-pyserial" ];
};
msys2-korad_ka3005p = msys2.makeMsys2Package {
name = "korad_ka3005p";
@ -532,6 +533,10 @@
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
cp ${zadig-binary} $out/zadig.exe
mkdir -p $out/clang64/etc/ssl/certs
cp -f $out/usr/ssl/certs/ca-bundle.crt $out/clang64/etc/ssl/certs/ca-bundle.crt
cp -f $out/usr/ssl/cert.pem $out/clang64/etc/ssl/cert.pem
cp -f $out/usr/ssl/certs/ca-bundle.trust.crt $out/clang64/etc/ssl/certs/ca-bundle.trust.crt
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* \

1
msys2/artiq_dependencies.txt
View File

@ -12,6 +12,7 @@ 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-python-platformdirs
mingw-w64-clang-x86_64-lld
mingw-w64-clang-x86_64-llvm
mingw-w64-clang-x86_64-openocd

62
msys2/artiq_dependency_packages.nix
View File

@ -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 {
@ -127,9 +127,9 @@
})
(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.r247.g121331cff-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb";
sha256 = "0mdcgzsn4mjjl4z0yaqcwqzxyimaqjci2s4smwmkh20pcq2qs4bh";
})
(pkgs.fetchurl {
@ -139,9 +139,9 @@
})
(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 {
@ -157,9 +157,9 @@
})
(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.33.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-c-ares";
sha256 = "01xg1h1a8kda0kq2921w25ybvm1ms7lfdzday0hv93f3myq7briq";
sha256 = "1rz95wcxw1lyfw10a56blz6x4fl07zm61k9ikw9w4iajng098q62";
})
(pkgs.fetchurl {
@ -217,9 +217,9 @@
})
(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.62.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-nghttp2";
sha256 = "07bkk98126gy4k6lb9rrqqnzjfz9j2rsr5dzr2djmzdkw0h4dr95";
sha256 = "08ddvaiad5l9k5wa3qra2clcfqphs93ymnv9hp3jwarzfx5k10n4";
})
(pkgs.fetchurl {
@ -229,9 +229,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.9.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.9.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-curl";
sha256 = "0nnn3pj9l8k66ifi7pxrg6n1fhisdj4klqxnd0xiq8njdbx8f61m";
sha256 = "1zr6kgqp9i4qqrfckh3kfmz4x1cwv4xis9sfqsx7xji88priax64";
})
(pkgs.fetchurl {
@ -241,9 +241,9 @@
})
(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.11.0-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-h5py";
sha256 = "0cxvsv1c3wb0i4s5cd5hz9n67vvqf9b0hk6phj3996nx9finsi2y";
sha256 = "17rzw7kkdk5462vfc2jvi8mkirvzk38clqgpdbrinf77y9yck98d";
})
(pkgs.fetchurl {
@ -307,9 +307,9 @@
})
(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 {
@ -337,9 +337,9 @@
})
(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.290.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-loader";
sha256 = "1flqk2wj56a8h4b07vxqcv8s7f4vvfrryr3fl9151y9gl96354vl";
sha256 = "1pfwi75jr1k8bmby5v8kx147671mxfm1h9br6y8y03wzhcbd4530";
})
(pkgs.fetchurl {
@ -373,9 +373,9 @@
})
(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-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqtgraph";
sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656";
sha256 = "0iscl5sh627vnxm2bdgxmwc52a7kg53wc4v7qkhpv1qfmvq5ms8c";
})
(pkgs.fetchurl {
@ -409,9 +409,9 @@
})
(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.5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-tqdm";
sha256 = "1f7yh9ld2bx7jy9p391wdbf1j0b3iacn1j7m9sv1c3bs79qx3mf7";
sha256 = "1njk8v5z05qpb12ki7zdywqxcn7lbvxw8hyn5ra6ndzp30s2p92r";
})
(pkgs.fetchurl {
@ -463,9 +463,9 @@
})
(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 {
@ -474,6 +474,12 @@
sha256 = "08b8pja1vhh7z0nrccr01qyfpkjqq8400ra0nvhpincwlaw5rcwn";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-platformdirs-4.2.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-platformdirs";
sha256 = "02rcc0d6hbk7b3axczlc4mhrzjk6bd823ygv1n5yzzc1mnmn8ca1";
})
(pkgs.fetchurl {
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";
@ -535,9 +541,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-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-capstone";
sha256 = "1n6540abhq7h7wvabvzg4x69pkkyqzl21jr0lxkr1sf35mq6rai1";
sha256 = "1anbw4a7zhcxs8s66f3p76c5cnsv9xxldzh1n8bg7xba3fz8qqaa";
})
(pkgs.fetchurl {

16
msys2/make_msys2_packages.sh
View File

@ -24,7 +24,9 @@ pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/
--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
local in=$1
local out=$2
echo "{ pkgs } : [" > $out
while IFS= read -r line; do
read -r url package <<< "$line"
hash=$(nix-prefetch-url $url --name $package)
@ -33,11 +35,11 @@ function generate_nix_packages_from_pacman() {
url = \"$url\";
name = \"$package\";
sha256 = \"$hash\";
})" >> $OUT
done < $IN
echo "]" >> $OUT
})" >> $out
done < $in
echo "]" >> $out
}
IN=$MSYS2DIR/packages.txt OUT=msys2_packages.nix generate_nix_packages_from_pacman
IN=$MSYS2DIR/qt_ifw_packages.txt OUT=msys2_qt_ifw_packages.nix generate_nix_packages_from_pacman
IN=$MSYS2DIR/artiq_dependency_packages.txt OUT=artiq_dependency_packages.nix generate_nix_packages_from_pacman
generate_nix_packages_from_pacman $MSYS2DIR/packages.txt msys2_packages.nix
generate_nix_packages_from_pacman $MSYS2DIR/qt_ifw_packages.txt msys2_qt_ifw_packages.nix
generate_nix_packages_from_pacman $MSYS2DIR/artiq_dependency_packages.txt artiq_dependency_packages.nix

32
msys2/msys2_packages.nix
View File

@ -79,15 +79,15 @@
})
(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.r247.g121331cff-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-headers-git";
sha256 = "1h3cdcajz29iq7vja908kkijz1vb9xn0f7w1lw1ima0q0zhinv4q";
sha256 = "1nrni2s9k2j547akx0kyjm59qgnnq3k02fqz17rdj311awhny1y4";
})
(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.r247.g121331cff-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-crt-git";
sha256 = "15kamyi3b0j6f5zxin4i2jgzjc7lzvwl4z5cz3dx0i8hg91aq0n7";
sha256 = "1c9pak7k7h3zksb3bkl2i5c8cdkyaibf9n25hh66wlh0c1qb3pda";
})
(pkgs.fetchurl {
@ -97,15 +97,15 @@
})
(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.r247.g121331cff-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb";
sha256 = "0mdcgzsn4mjjl4z0yaqcwqzxyimaqjci2s4smwmkh20pcq2qs4bh";
})
(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.r247.g121331cff-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-winpthreads-git";
sha256 = "0rh2mn078cifcmr4as4k57jxjln5lbnsmpx47h9d0s5d2i8sf2rc";
sha256 = "19qv0l0s8ffckjsivb6p9p3g4badbhzl7sqixchzhn9s43sdsg0x";
})
(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 {
@ -205,9 +205,9 @@
})
(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 {
@ -217,9 +217,9 @@
})
(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-72.2.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-setuptools";
sha256 = "1d2l3bnbmhl0a2an9fpwa83hbsm7szfxjr9vg8df45cnwgpxrxjb";
sha256 = "0lsf2cnz6b5g3850r3mdyibqkqdn4xr598v7n1hi9ihmwvbw9749";
})
(pkgs.fetchurl {