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

update NAC3, switch Windows to CLANG64 and Python 3.11

This commit is contained in:
Sebastien Bourdeauducq 2023-11-25 14:00:09 +08:00
parent 931b3172c4
commit 9f368ee610
5 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -64,11 +64,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1699672258, "lastModified": 1700820685,
"narHash": "sha256-gZb++0RLKFnxj3RftNTdoX4NedWGM6MQr6MkcCfBmbk=", "narHash": "sha256-Tir7h8esL4kp+0V9fe0OpC8LQvC8ZQlF9fu0B5QAnfo=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "f020d61cbb3b103182337c9cf57daef35dfa0c4a", "rev": "fcda360ad63857c2d4a0376e3e0a4dd6c1e77a9e",
"revCount": 931, "revCount": 937,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/m-labs/nac3.git" "url": "https://git.m-labs.hk/m-labs/nac3.git"
}, },
@ -79,11 +79,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699343069, "lastModified": 1700786208,
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", "narHash": "sha256-vP0WI7qNkg3teQJN5xjFcxgnBNiKCbkgw3X9HcAxWJY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", "rev": "8b8c9407844599546393146bfac901290e0ab96b",
"type": "github" "type": "github"
}, },
"original": { "original": {

34
windows/PKGBUILD.artiq
View File

@ -1,25 +1,25 @@
pkgbase="mingw-w64-artiq" pkgbase="mingw-w64-artiq"
pkgname="mingw-w64-x86_64-artiq" pkgname="mingw-w64-clang-x86_64-artiq"
pkgrel=1 pkgrel=1
pkgdesc="A leading-edge control system for quantum information experiments" pkgdesc="A leading-edge control system for quantum information experiments"
license=("LGPL") license=("LGPL")
depends=( depends=(
"mingw-w64-x86_64-python" "mingw-w64-clang-x86_64-python"
"mingw-w64-x86_64-python-h5py" "mingw-w64-clang-x86_64-python-h5py"
"mingw-w64-x86_64-python-lmdb" "mingw-w64-clang-x86_64-python-lmdb"
"mingw-w64-x86_64-python-pyqt5" "mingw-w64-clang-x86_64-python-pyqt5"
"mingw-w64-x86_64-qt5-svg" "mingw-w64-clang-x86_64-qt5-svg"
"mingw-w64-x86_64-python-qasync" "mingw-w64-clang-x86_64-python-qasync"
"mingw-w64-x86_64-python-pyqtgraph" "mingw-w64-clang-x86_64-python-pyqtgraph"
"mingw-w64-x86_64-python-numpy" "mingw-w64-clang-x86_64-python-numpy"
"mingw-w64-x86_64-python-scipy" "mingw-w64-clang-x86_64-python-scipy"
"mingw-w64-x86_64-python-dateutil" "mingw-w64-clang-x86_64-python-dateutil"
"mingw-w64-x86_64-python-prettytable" "mingw-w64-clang-x86_64-python-prettytable"
"mingw-w64-x86_64-python-tqdm" "mingw-w64-clang-x86_64-python-tqdm"
"mingw-w64-x86_64-python-pygit2" "mingw-w64-clang-x86_64-python-pygit2"
"mingw-w64-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-sipyco"
"mingw-w64-x86_64-nac3artiq" "mingw-w64-clang-x86_64-nac3artiq"
"mingw-w64-x86_64-artiq-comtools" "mingw-w64-clang-x86_64-artiq-comtools"
) )
source PKGBUILD.common source PKGBUILD.common

10
windows/PKGBUILD.artiq-comtools
View File

@ -1,13 +1,13 @@
pkgbase="mingw-w64-artiq-comtools" pkgbase="mingw-w64-artiq-comtools"
pkgname="mingw-w64-x86_64-artiq-comtools" pkgname="mingw-w64-clang-x86_64-artiq-comtools"
pkgrel=1 pkgrel=1
pkgdesc="Lightweight ARTIQ communication tools" pkgdesc="Lightweight ARTIQ communication tools"
license=("LGPL") license=("LGPL")
depends=( depends=(
"mingw-w64-x86_64-python" "mingw-w64-clang-x86_64-python"
"mingw-w64-x86_64-python-sipyco" "mingw-w64-clang-x86_64-python-sipyco"
"mingw-w64-x86_64-python-numpy" "mingw-w64-clang-x86_64-python-numpy"
"mingw-w64-x86_64-python-aiohttp" "mingw-w64-clang-x86_64-python-aiohttp"
) )
source PKGBUILD.common source PKGBUILD.common

17
windows/PKGBUILD.common
View File

@ -1,32 +1,29 @@
arch=("any") arch=("any")
mingw_arch=("mingw64") mingw_arch=("clang64")
pkgver=${DRV_VERSION} pkgver=${DRV_VERSION}
url="https://m-labs.hk" url="https://m-labs.hk"
source=("source.tar") source=("source.tar")
sha256sums=("SKIP") sha256sums=("SKIP")
build() { build() {
mkdir mingw64 mkdir clang64
export PYTHONPATH=`pwd`/mingw64/lib/python3.10/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=../mingw64 --record=setuptools-sucks.txt wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt
cd .. 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/...) # 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 [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!python|" $entrypoint sed -i "1s|#!.*|#!python|" $entrypoint
done done
for entrypoint in mingw64/bin/*-script.pyw; do for entrypoint in clang64/bin/*-script.pyw; do
[ -f "$entrypoint" ] || continue [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!pythonw|" $entrypoint sed -i "1s|#!.*|#!pythonw|" $entrypoint
done done
} }
package() { package() {
cp -R mingw64 ${pkgdir} cp -R clang64 ${pkgdir}
} }

8
windows/PKGBUILD.sipyco
View File

@ -1,12 +1,12 @@
pkgbase="mingw-w64-python-sipyco" pkgbase="mingw-w64-python-sipyco"
pkgname="mingw-w64-x86_64-python-sipyco" pkgname="mingw-w64-clang-x86_64-python-sipyco"
pkgrel=1 pkgrel=1
pkgdesc="Simple Python Communications" pkgdesc="Simple Python Communications"
license=("LGPL") license=("LGPL")
depends=( depends=(
"mingw-w64-x86_64-python" "mingw-w64-clang-x86_64-python"
"mingw-w64-x86_64-python-numpy" "mingw-w64-clang-x86_64-python-numpy"
"mingw-w64-x86_64-python-pybase64" "mingw-w64-clang-x86_64-python-pybase64"
) )
source PKGBUILD.common source PKGBUILD.common