From 5797648204dfec9ebb04515bebfc21b1f00645be Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 14 Nov 2019 15:22:17 +0800
Subject: [PATCH] build artiq-comtools

---
 artiq-fast/conda-artiq-deps.nix |  1 -
 artiq-fast/pkgs/artiq.nix       |  2 +-
 artiq-fast/pkgs/python-deps.nix |  4 ++--
 artiq-full/extras.nix           | 28 +++++++++++++++++++++++++---
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/artiq-fast/conda-artiq-deps.nix b/artiq-fast/conda-artiq-deps.nix
index 2be8139..e213408 100644
--- a/artiq-fast/conda-artiq-deps.nix
+++ b/artiq-fast/conda-artiq-deps.nix
@@ -13,7 +13,6 @@
   "quamash"
   "pyqtgraph 0.10.0"
   "pygit2"
-  "aiohttp >=3"
   "python-levenshtein"
   "sipyco"
 ]
diff --git a/artiq-fast/pkgs/artiq.nix b/artiq-fast/pkgs/artiq.nix
index 83555fa..658fd79 100644
--- a/artiq-fast/pkgs/artiq.nix
+++ b/artiq-fast/pkgs/artiq.nix
@@ -10,7 +10,7 @@ in
     preBuild = "export VERSIONEER_OVERRIDE=${version}";
     propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq qt5Full ]
       ++ (with pythonDeps; [ sipyco levenshtein pyqtgraph-qt5 quamash pythonparser ])
-      ++ (with python3Packages; [ aiohttp pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 ]);
+      ++ (with python3Packages; [ pygit2 numpy dateutil 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 2ebe936..c75b711 100644
--- a/artiq-fast/pkgs/python-deps.nix
+++ b/artiq-fast/pkgs/python-deps.nix
@@ -8,8 +8,8 @@ rec {
     src = fetchFromGitHub {
       owner = "m-labs";
       repo = "sipyco";
-      rev = "5d550bce964a9955546130236be13af2891b090a";
-      sha256 = "0rn4zj7sz2llph91m2bsm1i27f2gbsnzkj8vbwa8944k23ci19xg";
+      rev = "af20168bd5f5d024f36aee93c377a1ac916a3ac1";
+      sha256 = "0q7gyl94808ry6h8nvyhx4vkwvbcpbcxi5xpjp0q3baid5gw59zx";
     };
     propagatedBuildInputs = with python3Packages; [ numpy ];
   };
diff --git a/artiq-full/extras.nix b/artiq-full/extras.nix
index 613de41..4ece2fa 100644
--- a/artiq-full/extras.nix
+++ b/artiq-full/extras.nix
@@ -1,5 +1,7 @@
 { pkgs, sipyco, asyncserial, artiq }:
 let
+  condaBuild = import ./fast/conda-build.nix { inherit pkgs; };
+  condaFakeSource = import ./fast/conda-fake-source.nix { inherit pkgs; };
   dualPackage = (
     { name, version, src, pythonOptions ? {}, condaOptions ? {}}:
       {
@@ -29,9 +31,9 @@ let
               echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
               '';
         };
-        "conda-${name}" = import ./fast/conda-build.nix { inherit pkgs; } {
+        "conda-${name}" = condaBuild {
           name = "conda-${name}";
-          src = import ./fast/conda-fake-source.nix { inherit pkgs; } ({
+          src = condaFakeSource ({
             inherit name version src;
           } // condaOptions);
         };
@@ -173,4 +175,24 @@ in
       checkPhase = "python -m highfinesse_net.aqctl_highfinesse_net -h";
     };
     condaOptions = { dependencies = [ "sipyco" ]; };
-  })
+  }) // rec {
+    artiq-comtools = pkgs.python3Packages.buildPythonPackage rec {
+      name = "artiq-comtools-${version}";
+      version = "1.0";
+      src = pkgs.fetchFromGitHub {
+        owner = "m-labs";
+        repo = "artiq-comtools";
+        rev = "398f6becdaf89ec2e115106778467f9a766a2007";
+        sha256 = "02i2a1mmzc7jixq4nkbmi1a4c0gk6kmm8bv1dxrka7m56nb9sk9w";
+      };
+      propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp ];
+    };
+    conda-artiq-comtools = condaBuild {
+      name = "conda-artiq-comtools";
+      src = condaFakeSource {
+        name = "artiq-comtools";
+        inherit (artiq-comtools) version src;
+        dependencies = [ "sipyco" "numpy" "aiohttp >=3" ];
+      };
+    };
+  }