M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

windows tests: revamp conda env, add asyncserial dependency

This commit is contained in:
Astro 2019-04-11 18:15:34 +02:00 committed by Sébastien Bourdeauducq
parent b5027f353b
commit ab9691a01d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/windows/install.nix
View File

@ -44,6 +44,7 @@ let
${openssh}/bin/scp -P 2022 ${sshOpts} \ ${openssh}/bin/scp -P 2022 ${sshOpts} \
"${src}" "${sshUser}@localhost:${target}" "${src}" "${sshUser}@localhost:${target}"
''; '';
condaEnv = "artiq-env";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "windows-installer"; name = "windows-installer";
@ -101,8 +102,8 @@ stdenv.mkDerivation {
${ssh "miniconda\\Scripts\\conda config --add channels conda-forge"} ${ssh "miniconda\\Scripts\\conda config --add channels conda-forge"}
${ssh "miniconda\\Scripts\\conda config --add channels m-labs"} ${ssh "miniconda\\Scripts\\conda config --add channels m-labs"}
${ssh "miniconda\\Scripts\\conda create -y -n artiq-env"} ${ssh "miniconda\\Scripts\\conda create -y -n ${condaEnv}"}
${ssh "miniconda\\Scripts\\conda install -y -n artiq-env numpy scipy python-dateutil h5py pythonparser levenshtein outputcheck llvmlite-artiq"} ${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} numpy scipy python-dateutil h5py pythonparser levenshtein outputcheck llvmlite-artiq asyncserial"}
${ssh "shutdown /p /f"} ${ssh "shutdown /p /f"}
echo "Waiting for qemu exit" echo "Waiting for qemu exit"