From e7a1686166be7587e020b2e0b51b08c7f4db566e Mon Sep 17 00:00:00 2001
From: Ada <vesc6053@colorado.edu>
Date: Thu, 3 Mar 2022 19:25:04 -0700
Subject: [PATCH] shell dev: add more libraries

---
 artiq-fast/shell-dev.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/artiq-fast/shell-dev.nix b/artiq-fast/shell-dev.nix
index cff1fdd..cea20fd 100644
--- a/artiq-fast/shell-dev.nix
+++ b/artiq-fast/shell-dev.nix
@@ -12,6 +12,12 @@ let
     propagatedBuildInputs = [ pkgs.python3Packages.statsmodels ];
     doCheck = false;
     };
+  metaarray = python3Packages.buildPythonPackage rec {
+    pname = "metaarray";
+    version = "0.1";
+    src = /home/thomp/scratch/metaarray;
+    propagatedBuildInputs = [ pkgs.python3Packages.numpy pkgs.python3Packages.h5py ];
+    };
   artiq_comtools = python3Packages.buildPythonPackage rec {
     pname = "artiq-comtools";
     version = "0.1";
@@ -19,12 +25,6 @@ let
     propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp  ];
     doCheck = false;
     };
-  artiq_tools = python3Packages.buildPythonPackage rec {
-    pname = "artiq_tools";
-    version = "0.2";
-    src = /home/thomp/scratch/artiq_tools;
-    propagatedBuildInputs = [ pkgs.python3Packages.numpy pkgs.python3Packages.typing artiqpkgs.artiq pkgs.python3Packages.pyzmq pkgs.python3Packages.matplotlib];
-    };
   oitg = python3Packages.buildPythonPackage rec {
     pname = "oitg";
     version = "0.1";
@@ -44,6 +44,12 @@ let
     src = /home/thomp/scratch/strontium-library;
     propagatedBuildInputs = [ pkgs.python3Packages.numpy pkgs.python3Packages.scipy pkgs.python3Packages.matplotlib pkgs.python3Packages.influxdb];
     };
+  artiq_tools = python3Packages.buildPythonPackage rec {
+    pname = "artiq_tools";
+    version = "0.2";
+    src = /home/thomp/scratch/artiq_tools;
+    propagatedBuildInputs = [ pkgs.python3Packages.numpy pkgs.python3Packages.typing artiqpkgs.artiq pkgs.python3Packages.pyzmq pkgs.python3Packages.matplotlib strontium_library metaarray];
+    };
   ndscan = python3Packages.buildPythonPackage rec {
     pname = "ndscan";
     version = "0.1";
@@ -62,7 +68,7 @@ let
     pname = "repo_routines";
     version = "0.1";
     src = /home/thomp/scratch/repo_routines;
-    propagatedBuildInputs = [ ndscan pkgs.python3Packages.numpy artiqpkgs.artiq];
+    propagatedBuildInputs = [ ndscan pkgs.python3Packages.numpy artiqpkgs.artiq strontium_library];
     doCheck = false;
     };
 
@@ -72,6 +78,7 @@ in
     buildInputs = [
       vivado
       sipyco
+      metaarray
       artiq_comtools
       artiq_tools
       analysis_library
@@ -89,6 +96,7 @@ in
       artiqpkgs.openocd
     ];
     shellHook = ''
+      export PYTHONPATH="/home/thomp/scratch/metaarray:$PYTHONPATH"
       export PYTHONPATH="/home/thomp/scratch/artiq_tools:$PYTHONPATH"
       export PYTHONPATH="/home/thomp/scratch/oitg:$PYTHONPATH"
       export PYTHONPATH="/home/thomp/scratch/analysis-library:$PYTHONPATH"