mirror of https://github.com/m-labs/artiq.git
windows: use upstream pyqtgraph and qasync
This commit is contained in:
parent
c3ad77ec30
commit
6ac7aced34
|
@ -367,8 +367,6 @@
|
||||||
|
|
||||||
hydraJobs = {
|
hydraJobs = {
|
||||||
inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock openocd-bscanspi;
|
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;
|
sipyco-msys2-pkg = packages.x86_64-w64-mingw32.sipyco-pkg;
|
||||||
artiq-comtools-msys2-pkg = packages.x86_64-w64-mingw32.artiq-comtools-pkg;
|
artiq-comtools-msys2-pkg = packages.x86_64-w64-mingw32.artiq-comtools-pkg;
|
||||||
artiq-msys2-pkg = packages.x86_64-w64-mingw32.artiq-pkg;
|
artiq-msys2-pkg = packages.x86_64-w64-mingw32.artiq-pkg;
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -28,16 +28,6 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in rec {
|
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 {
|
sipyco-pkg = makeMsys2 {
|
||||||
name = "sipyco";
|
name = "sipyco";
|
||||||
src = sipyco;
|
src = sipyco;
|
||||||
|
@ -61,8 +51,6 @@ in rec {
|
||||||
''
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
cd $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 ${sipyco-pkg}/*.pkg.tar.zst .
|
||||||
ln -s ${artiq-comtools-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 .
|
ln -s ${nac3.packages.x86_64-w64-mingw32.nac3artiq-pkg}/*.pkg.tar.zst .
|
||||||
|
|
Loading…
Reference in New Issue