From ac89dfeb707b9c59441d9a66b904c683d6904adc Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Sat, 13 Apr 2019 23:34:23 +0200
Subject: [PATCH] windows tests: get latest anaconda version working

---
 artiq/windows/default.nix |  4 ++--
 artiq/windows/install.nix | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix
index 2be7633..c6b0d3a 100644
--- a/artiq/windows/default.nix
+++ b/artiq/windows/default.nix
@@ -40,13 +40,13 @@ in
       ${ssh "ver"}
       for pkg in ${artiqPkg}/noarch/artiq*.tar.bz2 ; do
         ${scp "\$pkg" "artiq.tar.bz2"}
-        ${ssh "miniconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"}
+        ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"}
       done
 
       # Allow tests to run for 2 minutes
       ${ssh "shutdown -s -t ${toString testTimeout}"}
 
-      ${ssh "miniconda\\scripts\\activate ${condaEnv} && python -m unittest discover -v artiq.test"}
+      ${ssh "anaconda\\scripts\\activate ${condaEnv} && python -m unittest discover -v artiq.test"}
 
       # Abort timeouted shutdown
       ${ssh "shutdown -a"}
diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix
index 2b5a20c..7643aa4 100644
--- a/artiq/windows/install.nix
+++ b/artiq/windows/install.nix
@@ -10,10 +10,9 @@ let
     url = "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
     sha256 = "668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a";
   };
-  # Newer Miniconda contains unusable OpenSSL, preventing any package fetching
-  miniconda = fetchurl {
-    url = "https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Windows-x86_64.exe";
-    sha256 = "1kyf03571fhxd0a9f8bcpmqfdpw7461kclfyb4yb3dsi783y4sck";
+  anaconda = fetchurl {
+    url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe";
+    sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj";
   };
 
   qemu = import ./qemu.nix {
@@ -24,6 +23,7 @@ let
   ssh = cmd: qemu.ssh (qemu.escape cmd);
   scp = qemu.scp;
 
+  sshCondaEnv = cmd: ssh "anaconda\\scripts\\activate && ${cmd}";
   condaEnv = "artiq-env";
   condaDepSpecs =
     builtins.concatStringsSep " "
@@ -68,18 +68,18 @@ stdenv.mkDerivation {
     cat ${instructions}
 
     read
+
     ${ssh "ver"}
 
-    ${scp miniconda "Miniconda.exe"}
-    ${ssh "start /wait \"\" Miniconda.exe /S /D=%cd%\\miniconda"}
-    ${ssh "del Miniconda.exe"}
+    ${scp anaconda "Anaconda.exe"}
+    ${ssh "start /wait \"\" Anaconda.exe /S /D=%cd%\\anaconda"}
 
-    ${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} ${condaDepSpecs}"}
+    ${sshCondaEnv "conda config --add channels conda-forge"}
+    ${sshCondaEnv "conda config --add channels m-labs"}
+    ( ${sshCondaEnv "conda update -y conda"} ) || true
+    ${sshCondaEnv "conda update -y --all"}
+    ${sshCondaEnv "conda create -y -n ${condaEnv}"}
+    ${sshCondaEnv "conda install -y -n ${condaEnv} ${condaDepSpecs}"}
     ${ssh "shutdown /p /f"}
 
     echo "Waiting for qemu exit"