From f03d0370db2f3ac9e5715e751d3d0f94aaa7640d Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 9 Jun 2020 15:47:35 +0800
Subject: [PATCH] artiq: use nixpkgs quamash

---
 artiq-fast/default.nix          |  2 +-
 artiq-fast/pkgs/artiq.nix       |  4 ++--
 artiq-fast/pkgs/python-deps.nix | 12 ------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 9280844..4415dc8 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -18,7 +18,7 @@ let
         "artiq-board-${board.target}-${board.variant}" = boardBinaries;
       }) {} boards;
   mainPackages = rec {
-    inherit (pythonDeps) sipyco asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
+    inherit (pythonDeps) sipyco asyncserial levenshtein pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
     binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
     binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
     llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix
index 658fd79..c1d9e14 100644
--- a/artiq-fast/pkgs/artiq.nix
+++ b/artiq-fast/pkgs/artiq.nix
@@ -9,8 +9,8 @@ in
     src = import ./artiq-src.nix { inherit fetchgit; };
     preBuild = "export VERSIONEER_OVERRIDE=${version}";
     propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
-      ++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ])
-      ++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
+      ++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 pythonparser ])
+      ++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial h5py pyqt5 ]);
     checkInputs = [ binutils-or1k outputcheck ];
     checkPhase =
     ''
diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix
index f8e07d1..69463b7 100644
--- a/artiq-fast/pkgs/python-deps.nix
+++ b/artiq-fast/pkgs/python-deps.nix
@@ -48,18 +48,6 @@ rec {
     propagatedBuildInputs = with python3Packages; [ regex ];
   };
 
-  quamash = python3Packages.buildPythonPackage rec {
-    name = "quamash";
-    src = fetchFromGitHub {
-      owner = "harvimt";
-      repo = "quamash";
-      rev = "e513b30f137415c5e098602fa383e45debab85e7";
-      sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa";
-    };
-    propagatedBuildInputs = with python3Packages; [ pyqt5 ];
-    doCheck = false;
-  };
-
   pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
     name = "pyqtgraph_qt5-${version}";
     version = "0.10.0";