From 64b56077cdce188b4f6613979f333e8ce94231c6 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 5 Apr 2022 16:26:08 +0800 Subject: [PATCH] windows: package pyqtgraph --- flake.nix | 1 + windows/PKGBUILD.artiq | 2 +- windows/PKGBUILD.common | 2 +- windows/PKGBUILD.pyqtgraph | 11 +++++++++++ windows/default.nix | 6 ++++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 windows/PKGBUILD.pyqtgraph diff --git a/flake.nix b/flake.nix index f2d536582..f153e52fe 100644 --- a/flake.nix +++ b/flake.nix @@ -363,6 +363,7 @@ hydraJobs = { inherit (packages.x86_64-linux) artiq artiq-board-kc705-nist_clock openocd-bscanspi; + 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; diff --git a/windows/PKGBUILD.artiq b/windows/PKGBUILD.artiq index be0a4a5c2..28dbd4913 100644 --- a/windows/PKGBUILD.artiq +++ b/windows/PKGBUILD.artiq @@ -8,7 +8,7 @@ depends=( "mingw-w64-x86_64-python-h5py" "mingw-w64-x86_64-python-pyqt5" # TODO "mingw-w64-x86_64-python-qasync" - # TODO "mingw-w64-x86_64-python-pyqtgraph" + "mingw-w64-x86_64-python-pyqtgraph" "mingw-w64-x86_64-python-numpy" "mingw-w64-x86_64-python-scipy" "mingw-w64-x86_64-python-dateutil" diff --git a/windows/PKGBUILD.common b/windows/PKGBUILD.common index 35315b21f..395e4805d 100644 --- a/windows/PKGBUILD.common +++ b/windows/PKGBUILD.common @@ -12,7 +12,7 @@ build() { cd source wine-msys2-build python setup.py install --prefix=../mingw64 cd .. - rm mingw64/lib/python3.9/site-packages/easy-install.pth + rm -f mingw64/lib/python3.9/site-packages/easy-install.pth } package() { diff --git a/windows/PKGBUILD.pyqtgraph b/windows/PKGBUILD.pyqtgraph new file mode 100644 index 000000000..ab090c3ef --- /dev/null +++ b/windows/PKGBUILD.pyqtgraph @@ -0,0 +1,11 @@ +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 diff --git a/windows/default.nix b/windows/default.nix index 68b764fb0..22c708670 100644 --- a/windows/default.nix +++ b/windows/default.nix @@ -28,6 +28,11 @@ let ''; }; in rec { + pyqtgraph-pkg = makeMsys2 { + name = "pyqtgraph"; + src = pkgs.python3Packages.pyqtgraph.src; + inherit (pkgs.python3Packages.pyqtgraph) version; + }; sipyco-pkg = makeMsys2 { name = "sipyco"; src = sipyco; @@ -51,6 +56,7 @@ in rec { '' mkdir $out cd $out + 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 .