From ab9691a01d124fedc15cb8a4b990f186a6091196 Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Thu, 11 Apr 2019 18:15:34 +0200
Subject: [PATCH] windows tests: revamp conda env, add asyncserial dependency

---
 artiq/windows/install.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix
index d9435fb..45c60c0 100644
--- a/artiq/windows/install.nix
+++ b/artiq/windows/install.nix
@@ -44,6 +44,7 @@ let
       ${openssh}/bin/scp -P 2022 ${sshOpts} \
       "${src}" "${sshUser}@localhost:${target}"
   '';
+  condaEnv = "artiq-env";
 in
 stdenv.mkDerivation {
   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 m-labs"}
-    ${ssh "miniconda\\Scripts\\conda create -y -n artiq-env"}
-    ${ssh "miniconda\\Scripts\\conda install -y -n artiq-env numpy scipy python-dateutil h5py pythonparser levenshtein outputcheck llvmlite-artiq"}
+    ${ssh "miniconda\\Scripts\\conda create -y -n ${condaEnv}"}
+    ${ssh "miniconda\\Scripts\\conda install -y -n ${condaEnv} numpy scipy python-dateutil h5py pythonparser levenshtein outputcheck llvmlite-artiq asyncserial"}
     ${ssh "shutdown /p /f"}
 
     echo "Waiting for qemu exit"