From 2d2a16adc38cb7602ffccab83f86f413572cb096 Mon Sep 17 00:00:00 2001
From: Ada <vesc6053@colorado.edu>
Date: Tue, 1 Mar 2022 12:35:24 -0700
Subject: [PATCH] add artiq comtools and repo routines

---
 artiq-fast/shell-dev.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/artiq-fast/shell-dev.nix b/artiq-fast/shell-dev.nix
index df8f5ef..cff1fdd 100644
--- a/artiq-fast/shell-dev.nix
+++ b/artiq-fast/shell-dev.nix
@@ -12,6 +12,13 @@ let
     propagatedBuildInputs = [ pkgs.python3Packages.statsmodels ];
     doCheck = false;
     };
+  artiq_comtools = python3Packages.buildPythonPackage rec {
+    pname = "artiq-comtools";
+    version = "0.1";
+    src = /home/thomp/scratch/artiq-comtools;
+    propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp  ];
+    doCheck = false;
+    };
   artiq_tools = python3Packages.buildPythonPackage rec {
     pname = "artiq_tools";
     version = "0.2";
@@ -51,6 +58,13 @@ let
     propagatedBuildInputs = [ pkgs.python3Packages.h5py pkgs.python3Packages.matplotlib pkgs.python3Packages.scipy pkgs.python3Packages.numpy python_library strontium_library pkgs.python3Packages.uncertainties];
     doCheck = false;
     };
+  repo_routines = python3Packages.buildPythonPackage rec {
+    pname = "repo_routines";
+    version = "0.1";
+    src = /home/thomp/scratch/repo_routines;
+    propagatedBuildInputs = [ ndscan pkgs.python3Packages.numpy artiqpkgs.artiq];
+    doCheck = false;
+    };
 
 
 in
@@ -58,10 +72,12 @@ in
     buildInputs = [
       vivado
       sipyco
+      artiq_comtools
       artiq_tools
       analysis_library
       python_library
       strontium_library
+      repo_routines
       ndscan
       pkgs.gnumake
       (pkgs.python3.withPackages(ps: (with ps; [ jinja2 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ])))
@@ -80,6 +96,8 @@ in
       export PYTHONPATH="/home/thomp/scratch/strontium-library:$PYTHONPATH"
       export PYTHONPATH="/home/thomp/scratch/ndscan:$PYTHONPATH"
       export PYTHONPATH="/home/thomp/scratch/sipyco:$PYTHONPATH"
+      export PYTHONPATH="/home/thomp/scratch/artiq-comtools:$PYTHONPATH"
+      export PYTHONPATH="/home/thomp/scratch/repo_routines:$PYTHONPATH"
     '';
     TARGET_AR="or1k-linux-ar";
   }