add artiq comtools and repo routines

This commit is contained in:
Ada 2022-03-01 12:35:24 -07:00
parent 9b34f19bdf
commit 2d2a16adc3

View File

@ -12,6 +12,13 @@ let
propagatedBuildInputs = [ pkgs.python3Packages.statsmodels ]; propagatedBuildInputs = [ pkgs.python3Packages.statsmodels ];
doCheck = false; 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 { artiq_tools = python3Packages.buildPythonPackage rec {
pname = "artiq_tools"; pname = "artiq_tools";
version = "0.2"; 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]; propagatedBuildInputs = [ pkgs.python3Packages.h5py pkgs.python3Packages.matplotlib pkgs.python3Packages.scipy pkgs.python3Packages.numpy python_library strontium_library pkgs.python3Packages.uncertainties];
doCheck = false; 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 in
@ -58,10 +72,12 @@ in
buildInputs = [ buildInputs = [
vivado vivado
sipyco sipyco
artiq_comtools
artiq_tools artiq_tools
analysis_library analysis_library
python_library python_library
strontium_library strontium_library
repo_routines
ndscan ndscan
pkgs.gnumake pkgs.gnumake
(pkgs.python3.withPackages(ps: (with ps; [ jinja2 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ]))) (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/strontium-library:$PYTHONPATH"
export PYTHONPATH="/home/thomp/scratch/ndscan:$PYTHONPATH" export PYTHONPATH="/home/thomp/scratch/ndscan:$PYTHONPATH"
export PYTHONPATH="/home/thomp/scratch/sipyco:$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"; TARGET_AR="or1k-linux-ar";
} }