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

windows: use upstream pyqtgraph and qasync

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2022-05-27 15:32:47 +08:00
parent c3ad77ec30
commit 6ac7aced34
4 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -367,8 +367,6 @@
hydraJobs = {
inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock openocd-bscanspi;
qasync-msys2-pkg = packages.x86_64-w64-mingw32.qasync-pkg;
pyqtgraph-msys2-pkg = packages.x86_64-w64-mingw32.pyqtgraph-pkg;
sipyco-msys2-pkg = packages.x86_64-w64-mingw32.sipyco-pkg;
artiq-comtools-msys2-pkg = packages.x86_64-w64-mingw32.artiq-comtools-pkg;
artiq-msys2-pkg = packages.x86_64-w64-mingw32.artiq-pkg;

11
windows/PKGBUILD.pyqtgraph
View File

@ -1,11 +0,0 @@
pkgbase="mingw-w64-python-pyqtgraph"
pkgname="mingw-w64-x86_64-python-pyqtgraph"
pkgrel=1
pkgdesc="Fast data visualization and GUI tools for scientific / engineering applications"
license=("MIT")
depends=(
"mingw-w64-x86_64-python"
"mingw-w64-x86_64-python-pyqt5"
)
source PKGBUILD.common

11
windows/PKGBUILD.qasync
View File

@ -1,11 +0,0 @@
pkgbase="mingw-w64-python-qasync"
pkgname="mingw-w64-x86_64-python-qasync"
pkgrel=1
pkgdesc="Implementation of the PEP 3156 Event-Loop with Qt"
license=("BSD")
depends=(
"mingw-w64-x86_64-python"
"mingw-w64-x86_64-python-pyqt5"
)
source PKGBUILD.common

12
windows/default.nix
View File

@ -28,16 +28,6 @@ let
'';
};
in rec {
qasync-pkg = makeMsys2 {
name = "qasync";
src = artiq.packages.x86_64-linux.qasync.src;
inherit (artiq.packages.x86_64-linux.qasync) version;
};
pyqtgraph-pkg = makeMsys2 {
name = "pyqtgraph";
src = pkgs.python3Packages.pyqtgraph.src;
inherit (pkgs.python3Packages.pyqtgraph) version;
};
sipyco-pkg = makeMsys2 {
name = "sipyco";
src = sipyco;
@ -61,8 +51,6 @@ in rec {
''
mkdir $out
cd $out
ln -s ${qasync-pkg}/*.pkg.tar.zst .
ln -s ${pyqtgraph-pkg}/*.pkg.tar.zst .
ln -s ${sipyco-pkg}/*.pkg.tar.zst .
ln -s ${artiq-comtools-pkg}/*.pkg.tar.zst .
ln -s ${nac3.packages.x86_64-w64-mingw32.nac3artiq-pkg}/*.pkg.tar.zst .