fsagbuya
/
artiq-extrapkg
forked from M-Labs/artiq-extrapkg
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: fsagbuya:d5c99474ed80544d0c774bcfc9945f783881fbef
Branches Tags
fsagbuya:master
fsagbuya:platformdirs
fsagbuya:omit_scipy_8
fsagbuya:omit_scipy
fsagbuya:update_2-15-24
fsagbuya:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7
...
compare: fsagbuya:cbf5f5061d22260a7de12153cebaf41c3fd6a90b
Branches Tags
fsagbuya:platformdirs
fsagbuya:omit_scipy_8
fsagbuya:omit_scipy
fsagbuya:update_2-15-24
fsagbuya:master
fsagbuya:release-7
M-Labs:release-8
M-Labs:master
M-Labs:release-7

10 Commits
d5c99474ed ... cbf5f5061d

Author SHA1 Message Date
Florian Agbuya cbf5f5061d msys2: update 2024-08-27 15:57:46 +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
Egor Savkin eac0d077de Fix msys2 package 
Package appeared to have /nix/store... path instead of normal clang64

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-08-14 13:48:02 +08:00
Sebastien Bourdeauducq 32d116dbf6 flake: update dependencies 2024-08-02 10:32:02 +08:00
Sebastien Bourdeauducq 50abd84278 msys2: modernize python install script 2024-08-02 10:30:03 +08:00
Sebastien Bourdeauducq 9e85187ead flake: update dependencies 2024-07-31 17:44:17 +08:00
Sebastien Bourdeauducq 25ee3c68f1 wand: remove (no qt6) 2024-07-27 23:17:10 +08:00
Sebastien Bourdeauducq 7f00ab0cb6 update conda, py3.12 2024-07-27 22:44:47 +08:00
7 changed files with 123 additions and 113 deletions
Show Stats Expand all files Collapse all files

49
flake.lock
View File

@ -42,15 +42,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706553333, "lastModified": 1722288472,
"narHash": "sha256-woCaWllU5vKn0aXxt2VajlK7hseQe7LrJY5LAKF9LZ8=", "narHash": "sha256-KXyTCZNwXkMayGuOYLLIg8q/eCPC5W0pdcGQ0XKYoNY=",
"ref": "refs/heads/master", "ref": "release-7",
"rev": "86df3ceb606a50708f812ce8c3c8a4e7cfc3db8f", "rev": "b3d818f61ffffc29226d4aa3845dece9941d61cd",
"revCount": 35, "revCount": 37,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git" "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
}, },
"original": { "original": {
"ref": "release-7",
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git" "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
} }
@ -66,11 +67,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1722088173, "lastModified": 1722511793,
"narHash": "sha256-9FrVPf02jkgwwxuSAFMO+u7Lb5AP0MNsDElxV7c5vx4=", "narHash": "sha256-nsaKyk1YRSNMHBCAJJ32VSWzUAcGk9nuM6VGECum6m8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b5882950639dad8c7d3e0410378baec81e62c78a", "rev": "e627aaeda0216efc1f78973d457fb61fd310ce62",
"revCount": 8935, "revCount": 8961,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -97,11 +98,11 @@
"trap-dac-utils": "trap-dac-utils" "trap-dac-utils": "trap-dac-utils"
}, },
"locked": { "locked": {
"lastModified": 1721845753, "lastModified": 1722546775,
"narHash": "sha256-WjTO8zU2A/TcJVBzlUQtVwmG9f7XU1Z9GVhfem21ziU=", "narHash": "sha256-gOzLNFOMW/91M5QL1TQ5tp+6/DLxDQEhJH1JbT30gR0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "6ce867fc881e4f6c7ac80bf350ee3acd60e102f7", "rev": "612264c9058c1822f5e180e024a5607eb953f31a",
"revCount": 1348, "revCount": 1359,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git" "url": "https://gitlab.com/duke-artiq/dax.git"
}, },
@ -133,11 +134,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715377543, "lastModified": 1722261486,
"narHash": "sha256-JdHNJhgGkWqqUcsLfoZ7B/v4l6uwpegQvJuJAkfi2dw=", "narHash": "sha256-F+43turwuIdCcs8yu4rXCtSEE2ZDssFDEFex5+Uel4E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1ca15e9b607eb88a17e3dcab022cb0d31c8f2fea", "rev": "2888fa292a52ac6666590e1429786210cda04b18",
"revCount": 104, "revCount": 111,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/flake8-artiq.git" "url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
}, },
@ -354,11 +355,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714081850, "lastModified": 1718374915,
"narHash": "sha256-+zts5WigebrD8eg787dYlbByEBSXNGp7/ghRtcGkIDc=", "narHash": "sha256-XBB+9VPF8njZzqMrOaWlqlbf+NrnnDIvfVsiig2TPvc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a53849ade1400e30ac7399bcb05ae8508e725f48", "rev": "c3cf4be6bf6b1a42fc57eecd5afebb0beddfb02a",
"revCount": 298, "revCount": 300,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/trap-dac-utils.git" "url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
}, },

35
flake.nix
View File

@ -27,8 +27,8 @@
condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ]; condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
# Use the full Anaconda distribution, which already contains conda-build and its many dependencies. # Use the full Anaconda distribution, which already contains conda-build and its many dependencies.
condaInstaller = pkgs.fetchurl { condaInstaller = pkgs.fetchurl {
url = "https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh"; url = "https://repo.anaconda.com/archive/Anaconda3-2024.06-1-Linux-x86_64.sh";
sha256 = "sha256-xTbdt7S6c4vdvU5YGykwjLMy+hKuP6LNZoFL1zXf8jE="; sha256 = "1xx8a7jmyd93lkj9zvhmdn66zv10k421n6zszp85imsjk8yv96sk";
}; };
condaInstallerEnv = pkgs.buildFHSEnv { condaInstallerEnv = pkgs.buildFHSEnv {
name = "conda-installer-env"; name = "conda-installer-env";
@ -50,7 +50,7 @@
installPhase = installPhase =
'' ''
conda-installer-env -c "./conda-installer.sh -p $out -b" conda-installer-env -c "./conda-installer.sh -p $out -b"
substituteInPlace $out/lib/python3.11/site-packages/conda/gateways/disk/__init__.py \ substituteInPlace $out/lib/python3.12/site-packages/conda/gateways/disk/__init__.py \
--replace "os.chmod(path, 0o2775)" "pass" --replace "os.chmod(path, 0o2775)" "pass"
''; '';
}; };
@ -211,24 +211,6 @@
# no unit tests without hardware so do a simple smoke test # no unit tests without hardware so do a simple smoke test
checkPhase = "python -m hut2.aqctl_hut2 -h"; checkPhase = "python -m hut2.aqctl_hut2 -h";
}; };
wand = pkgs.python3Packages.buildPythonPackage {
pname = "wand";
version = "0.4.dev";
src = pkgs.fetchFromGitHub {
owner = "OxfordIonTrapGroup";
repo = "wand";
rev = "c080ddab6b2d94bb673ed32a0cea2bf68e66c702";
sha256 = "sha256-T27/mZepPrnheoVEKsP5cRDFc1JffTnuPvXq2r2GP4E=";
};
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
dontWrapQtApps = true;
postFixup = ''
wrapQtApp "$out/bin/wand_gui"
'';
propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq artiqpkgs.packages.x86_64-linux.qasync ]
++ [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco ]
++ (with pkgs.python3Packages; [ numpy scipy influxdb pyqtgraph setuptools ]);
};
flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq; flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq;
dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: { dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: {
nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt6.wrapQtAppsHook ]; nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt6.wrapQtAppsHook ];
@ -352,6 +334,7 @@
"tqdm" "tqdm"
"python-lmdb" "python-lmdb"
"artiq-comtools" "artiq-comtools"
"platformdirs"
]; ];
} }
@ -391,12 +374,6 @@
src = hut2.src; src = hut2.src;
dependencies = [ "sipyco" ]; dependencies = [ "sipyco" ];
} }
{
name = "wand";
version = wand.version;
src = wand.src;
dependencies = [ "artiq" "qasync" "numpy" "scipy" "influxdb" ];
}
{ {
name = "flake8-artiq"; name = "flake8-artiq";
version = flake8-artiq.version; version = flake8-artiq.version;
@ -556,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 --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 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 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* \ 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/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* \ $out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \

18
msys2/PKGBUILD.common
View File

@ -10,23 +10,19 @@ build() {
export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages
chmod +w -R source chmod +w -R source
cd source cd source
wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt wine-msys2-build python -m build --wheel --skip-dependency-check --no-isolation
cd .. }
# setuptools creates this file if it doesn't already exist, which causes conflicts between pacman packages package() {
# see: https://corte.si/posts/code/setuptoolssucks/ cd source
rm -f clang64/lib/python3.11/site-packages/easy-install.pth wine-msys2-build python -m installer --destdir="${pkgdir}" --prefix="clang64/" dist/*.whl
# patch broken shebangs (Z:/nix/store/...) # patch broken shebangs (Z:/nix/store/...)
for entrypoint in clang64/bin/*-script.py; do for entrypoint in ${pkgdir}/bin/*-script.py; do
[ -f "$entrypoint" ] || continue [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!python|" $entrypoint sed -i "1s|#!.*|#!python|" $entrypoint
done done
for entrypoint in clang64/bin/*-script.pyw; do for entrypoint in ${pkgdir}/bin/*-script.pyw; do
[ -f "$entrypoint" ] || continue [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!pythonw|" $entrypoint sed -i "1s|#!.*|#!pythonw|" $entrypoint
done done
} }
package() {
cp -R clang64 ${pkgdir}
}

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-llvmlite
mingw-w64-clang-x86_64-python-levenshtein mingw-w64-clang-x86_64-python-levenshtein
mingw-w64-clang-x86_64-python-lmdb 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-lld
mingw-w64-clang-x86_64-llvm mingw-w64-clang-x86_64-llvm
mingw-w64-clang-x86_64-openocd mingw-w64-clang-x86_64-openocd

70
msys2/artiq_dependency_packages.nix
View File

@ -79,9 +79,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-readline";
sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -97,9 +97,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-sqlite3";
sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -127,9 +127,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb"; sha256 = "0mdcgzsn4mjjl4z0yaqcwqzxyimaqjci2s4smwmkh20pcq2qs4bh";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -139,15 +139,15 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-openblas";
sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq";
}) })
(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-2.0.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; sha256 = "0ks6q8v58h4wmr2pzsjl2xm4f63g0psvfm0jwlz24mqfxp8gqfcc";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -157,9 +157,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-c-ares";
sha256 = "01xg1h1a8kda0kq2921w25ybvm1ms7lfdzday0hv93f3myq7briq"; sha256 = "1rz95wcxw1lyfw10a56blz6x4fl07zm61k9ikw9w4iajng098q62";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -217,9 +217,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-nghttp2";
sha256 = "07bkk98126gy4k6lb9rrqqnzjfz9j2rsr5dzr2djmzdkw0h4dr95"; sha256 = "08ddvaiad5l9k5wa3qra2clcfqphs93ymnv9hp3jwarzfx5k10n4";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -229,9 +229,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-curl";
sha256 = "0nnn3pj9l8k66ifi7pxrg6n1fhisdj4klqxnd0xiq8njdbx8f61m"; sha256 = "1zr6kgqp9i4qqrfckh3kfmz4x1cwv4xis9sfqsx7xji88priax64";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -241,9 +241,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-python-h5py";
sha256 = "0cxvsv1c3wb0i4s5cd5hz9n67vvqf9b0hk6phj3996nx9finsi2y"; sha256 = "17rzw7kkdk5462vfc2jvi8mkirvzk38clqgpdbrinf77y9yck98d";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -307,9 +307,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-freetype";
sha256 = "07kdykdz73jjqajarn1b1wv5mkwnwj7xw09x4iy11gpj6yz0sb8h"; sha256 = "08jn0qqibkk2s4q005ff0a1kz0yklq0cp7w4wd1g4h2ykczii2zy";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -337,9 +337,9 @@
}) })
(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.290.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-loader"; name = "mingw-w64-clang-x86_64-vulkan-loader";
sha256 = "1flqk2wj56a8h4b07vxqcv8s7f4vvfrryr3fl9151y9gl96354vl"; sha256 = "1pfwi75jr1k8bmby5v8kx147671mxfm1h9br6y8y03wzhcbd4530";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -373,9 +373,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-python-pyqtgraph";
sha256 = "08g4yjcc7abccgzza925rrdfzdd454c325gljs90ph0zb2fn3656"; sha256 = "0iscl5sh627vnxm2bdgxmwc52a7kg53wc4v7qkhpv1qfmvq5ms8c";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -409,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.5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-tqdm"; name = "mingw-w64-clang-x86_64-python-tqdm";
sha256 = "1f7yh9ld2bx7jy9p391wdbf1j0b3iacn1j7m9sv1c3bs79qx3mf7"; sha256 = "1njk8v5z05qpb12ki7zdywqxcn7lbvxw8hyn5ra6ndzp30s2p92r";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -463,9 +463,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-lmdb";
sha256 = "1gz4b261klr37xb56kj5ybymrsh6q237wkssmkjg32dy511asbiw"; sha256 = "0vmih3yhady422c6kpa0mzj1iv7ywd6xawzsz1zv46kcr88ylrsb";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -474,6 +474,12 @@
sha256 = "08b8pja1vhh7z0nrccr01qyfpkjqq8400ra0nvhpincwlaw5rcwn"; 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 { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-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"; name = "mingw-w64-clang-x86_64-libxml2";
@ -535,9 +541,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.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-capstone"; name = "mingw-w64-clang-x86_64-capstone";
sha256 = "1n6540abhq7h7wvabvzg4x69pkkyqzl21jr0lxkr1sf35mq6rai1"; sha256 = "1anbw4a7zhcxs8s66f3p76c5cnsv9xxldzh1n8bg7xba3fz8qqaa";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -595,9 +601,9 @@
}) })
(pkgs.fetchurl { (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.7.24-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-regex"; name = "mingw-w64-clang-x86_64-python-regex";
sha256 = "0abds3p4cbax0qx0vw71ajyjacv5j7hm42qikrij9hj19axzr8an"; sha256 = "12651vpnlimnb2srf5fd7jq0yqr4iyw5gwpwxjrjqp7dmzyhqxwq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {

3
msys2/make_msys2_packages.sh
View File

@ -14,7 +14,8 @@ fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
--cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \ --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-python3.11 \
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt mingw-w64-clang-x86_64-python-numpy \
mingw-w64-clang-x86_64-python-setuptools mingw-w64-clang-x86_64-python-build mingw-w64-clang-x86_64-python-installer > $MSYS2DIR/packages.txt
cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
--cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" - > $MSYS2DIR/artiq_dependency_packages.txt --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" - > $MSYS2DIR/artiq_dependency_packages.txt

60
msys2/msys2_packages.nix
View File

@ -79,15 +79,15 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-headers-git";
sha256 = "1h3cdcajz29iq7vja908kkijz1vb9xn0f7w1lw1ima0q0zhinv4q"; sha256 = "1nrni2s9k2j547akx0kyjm59qgnnq3k02fqz17rdj311awhny1y4";
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-crt-git";
sha256 = "15kamyi3b0j6f5zxin4i2jgzjc7lzvwl4z5cz3dx0i8hg91aq0n7"; sha256 = "1c9pak7k7h3zksb3bkl2i5c8cdkyaibf9n25hh66wlh0c1qb3pda";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -97,15 +97,15 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb"; sha256 = "0mdcgzsn4mjjl4z0yaqcwqzxyimaqjci2s4smwmkh20pcq2qs4bh";
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-winpthreads-git";
sha256 = "0rh2mn078cifcmr4as4k57jxjln5lbnsmpx47h9d0s5d2i8sf2rc"; sha256 = "19qv0l0s8ffckjsivb6p9p3g4badbhzl7sqixchzhn9s43sdsg0x";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -163,9 +163,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-readline";
sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -175,9 +175,9 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-sqlite3";
sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -205,20 +205,44 @@
}) })
(pkgs.fetchurl { (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"; name = "mingw-w64-clang-x86_64-openblas";
sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq";
}) })
(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-2.0.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "0psx1m42cn7hmdiyg5y5107ni4d6mksf1j9xy8jds3s2cj7fmx5c"; sha256 = "0ks6q8v58h4wmr2pzsjl2xm4f63g0psvfm0jwlz24mqfxp8gqfcc";
}) })
(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-72.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 = "0lsf2cnz6b5g3850r3mdyibqkqdn4xr598v7n1hi9ihmwvbw9749";
})
(pkgs.fetchurl {
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 = "103gjfj7lqy3bgmvl12v7y6szwqk02hs3ribiqxavzk8hswsky6a";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyproject-hooks-1.1.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyproject-hooks";
sha256 = "0ksb7pmwh0d1s5ic9srgx2cq01szsg49qm82bw04v2d0820s7df8";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-build-1.2.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-build";
sha256 = "1lkwj5hksz68gqcwhxswr5zr748479vrq7j6ini90lpbilhw59vs";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-installer-0.7.0-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-installer";
sha256 = "1xcaxnrzzla909ip7bijsbl0m7ck8bw4sxn2kvl7bhs0ja84sj3q";
}) })
] ]