From 2afaa9ddd384403da95210520a21268c9dd59dfe Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Sat, 13 Apr 2019 20:20:28 +0200
Subject: [PATCH] windows tests: update *, install full dependency list in
 install.nix

---
 artiq/windows/install.nix | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix
index 45c60c0..e0b4ae2 100644
--- a/artiq/windows/install.nix
+++ b/artiq/windows/install.nix
@@ -45,6 +45,28 @@ let
       "${src}" "${sshUser}@localhost:${target}"
   '';
   condaEnv = "artiq-env";
+  condaDependencies = [
+    "python >=3.5.3,<3.6"
+    "llvmlite-artiq 0.23.0.dev py35_5"
+    "binutils-or1k-linux >=2.27"
+    "pythonparser >=1.1"
+    "openocd 0.10.0 6"
+    "scipy"
+    "numpy"
+    "prettytable"
+    "asyncserial"
+    "h5py 2.8"
+    "python-dateutil"
+    "pyqt >=5.5"
+    "quamash"
+    "pyqtgraph 0.10.0"
+    "pygit2"
+    "aiohttp >=3"
+    "levenshtein"
+  ];
+  condaPkgSpecs =
+    builtins.concatStringsSep " "
+    (map (s: "\"${s}\"") condaDependencies);
 in
 stdenv.mkDerivation {
   name = "windows-installer";
@@ -102,8 +124,10 @@ stdenv.mkDerivation {
 
     ${ssh "miniconda\\Scripts\\conda config --add channels conda-forge"}
     ${ssh "miniconda\\Scripts\\conda config --add channels m-labs"}
+    ${ssh "miniconda\\Scripts\\conda update -y conda"}
+    ${ssh "miniconda\\Scripts\\conda update -y --all"}
     ${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 "miniconda\\Scripts\\conda install -y -n ${condaEnv} ${condaPkgSpecs}"}
     ${ssh "shutdown /p /f"}
 
     echo "Waiting for qemu exit"