From 6ac7aced344bf41335093d362efc1bd064a4f7a2 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 27 May 2022 15:32:47 +0800
Subject: [PATCH] windows: use upstream pyqtgraph and qasync

---
 flake.nix                  |  2 --
 windows/PKGBUILD.pyqtgraph | 11 -----------
 windows/PKGBUILD.qasync    | 11 -----------
 windows/default.nix        | 12 ------------
 4 files changed, 36 deletions(-)
 delete mode 100644 windows/PKGBUILD.pyqtgraph
 delete mode 100644 windows/PKGBUILD.qasync

diff --git a/flake.nix b/flake.nix
index 047729ba6..5e224581f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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;
diff --git a/windows/PKGBUILD.pyqtgraph b/windows/PKGBUILD.pyqtgraph
deleted file mode 100644
index ab090c3ef..000000000
--- a/windows/PKGBUILD.pyqtgraph
+++ /dev/null
@@ -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
diff --git a/windows/PKGBUILD.qasync b/windows/PKGBUILD.qasync
deleted file mode 100644
index e871cc52f..000000000
--- a/windows/PKGBUILD.qasync
+++ /dev/null
@@ -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
diff --git a/windows/default.nix b/windows/default.nix
index 8f4a48a1b..68b764fb0 100644
--- a/windows/default.nix
+++ b/windows/default.nix
@@ -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 .