diff --git a/flake.lock b/flake.lock index 972fa9a3f..f4a396f2d 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1699672258, - "narHash": "sha256-gZb++0RLKFnxj3RftNTdoX4NedWGM6MQr6MkcCfBmbk=", + "lastModified": 1700820685, + "narHash": "sha256-Tir7h8esL4kp+0V9fe0OpC8LQvC8ZQlF9fu0B5QAnfo=", "ref": "refs/heads/master", - "rev": "f020d61cbb3b103182337c9cf57daef35dfa0c4a", - "revCount": 931, + "rev": "fcda360ad63857c2d4a0376e3e0a4dd6c1e77a9e", + "revCount": 937, "type": "git", "url": "https://git.m-labs.hk/m-labs/nac3.git" }, @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1700786208, + "narHash": "sha256-vP0WI7qNkg3teQJN5xjFcxgnBNiKCbkgw3X9HcAxWJY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "8b8c9407844599546393146bfac901290e0ab96b", "type": "github" }, "original": { diff --git a/windows/PKGBUILD.artiq b/windows/PKGBUILD.artiq index c2ae0b99f..d16ee6a1d 100644 --- a/windows/PKGBUILD.artiq +++ b/windows/PKGBUILD.artiq @@ -1,25 +1,25 @@ pkgbase="mingw-w64-artiq" -pkgname="mingw-w64-x86_64-artiq" +pkgname="mingw-w64-clang-x86_64-artiq" pkgrel=1 pkgdesc="A leading-edge control system for quantum information experiments" license=("LGPL") depends=( - "mingw-w64-x86_64-python" - "mingw-w64-x86_64-python-h5py" - "mingw-w64-x86_64-python-lmdb" - "mingw-w64-x86_64-python-pyqt5" - "mingw-w64-x86_64-qt5-svg" - "mingw-w64-x86_64-python-qasync" - "mingw-w64-x86_64-python-pyqtgraph" - "mingw-w64-x86_64-python-numpy" - "mingw-w64-x86_64-python-scipy" - "mingw-w64-x86_64-python-dateutil" - "mingw-w64-x86_64-python-prettytable" - "mingw-w64-x86_64-python-tqdm" - "mingw-w64-x86_64-python-pygit2" - "mingw-w64-x86_64-python-sipyco" - "mingw-w64-x86_64-nac3artiq" - "mingw-w64-x86_64-artiq-comtools" + "mingw-w64-clang-x86_64-python" + "mingw-w64-clang-x86_64-python-h5py" + "mingw-w64-clang-x86_64-python-lmdb" + "mingw-w64-clang-x86_64-python-pyqt5" + "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" + "mingw-w64-clang-x86_64-python-pygit2" + "mingw-w64-clang-x86_64-python-sipyco" + "mingw-w64-clang-x86_64-nac3artiq" + "mingw-w64-clang-x86_64-artiq-comtools" ) source PKGBUILD.common diff --git a/windows/PKGBUILD.artiq-comtools b/windows/PKGBUILD.artiq-comtools index 2bd5f3e64..11598c88a 100644 --- a/windows/PKGBUILD.artiq-comtools +++ b/windows/PKGBUILD.artiq-comtools @@ -1,13 +1,13 @@ pkgbase="mingw-w64-artiq-comtools" -pkgname="mingw-w64-x86_64-artiq-comtools" +pkgname="mingw-w64-clang-x86_64-artiq-comtools" pkgrel=1 pkgdesc="Lightweight ARTIQ communication tools" license=("LGPL") depends=( - "mingw-w64-x86_64-python" - "mingw-w64-x86_64-python-sipyco" - "mingw-w64-x86_64-python-numpy" - "mingw-w64-x86_64-python-aiohttp" + "mingw-w64-clang-x86_64-python" + "mingw-w64-clang-x86_64-python-sipyco" + "mingw-w64-clang-x86_64-python-numpy" + "mingw-w64-clang-x86_64-python-aiohttp" ) source PKGBUILD.common diff --git a/windows/PKGBUILD.common b/windows/PKGBUILD.common index 504785679..e8c58f2c7 100644 --- a/windows/PKGBUILD.common +++ b/windows/PKGBUILD.common @@ -1,32 +1,29 @@ arch=("any") -mingw_arch=("mingw64") +mingw_arch=("clang64") pkgver=${DRV_VERSION} url="https://m-labs.hk" source=("source.tar") sha256sums=("SKIP") build() { - mkdir mingw64 - export PYTHONPATH=`pwd`/mingw64/lib/python3.10/site-packages + mkdir clang64 + export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages chmod +w -R source cd source - wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../mingw64 --record=setuptools-sucks.txt + wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt cd .. - # setuptools creates this file if it doesn't already exist, which causes conflicts between pacman packages - # see: https://corte.si/posts/code/setuptoolssucks/ - rm -f mingw64/lib/python3.10/site-packages/easy-install.pth # patch broken shebangs (Z:/nix/store/...) - for entrypoint in mingw64/bin/*-script.py; do + for entrypoint in clang64/bin/*-script.py; do [ -f "$entrypoint" ] || continue sed -i "1s|#!.*|#!python|" $entrypoint done - for entrypoint in mingw64/bin/*-script.pyw; do + for entrypoint in clang64/bin/*-script.pyw; do [ -f "$entrypoint" ] || continue sed -i "1s|#!.*|#!pythonw|" $entrypoint done } package() { - cp -R mingw64 ${pkgdir} + cp -R clang64 ${pkgdir} } diff --git a/windows/PKGBUILD.sipyco b/windows/PKGBUILD.sipyco index 7430d590e..ebaa740b4 100644 --- a/windows/PKGBUILD.sipyco +++ b/windows/PKGBUILD.sipyco @@ -1,12 +1,12 @@ pkgbase="mingw-w64-python-sipyco" -pkgname="mingw-w64-x86_64-python-sipyco" +pkgname="mingw-w64-clang-x86_64-python-sipyco" pkgrel=1 pkgdesc="Simple Python Communications" license=("LGPL") depends=( - "mingw-w64-x86_64-python" - "mingw-w64-x86_64-python-numpy" - "mingw-w64-x86_64-python-pybase64" + "mingw-w64-clang-x86_64-python" + "mingw-w64-clang-x86_64-python-numpy" + "mingw-w64-clang-x86_64-python-pybase64" ) source PKGBUILD.common