From 6bbbd41ece5abf4325dc370db097086387230db4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 May 2020 15:26:23 +0100 Subject: [PATCH] Remove anaconda bundle This one will be installed in a separate step incrementally --- artiq-fast/windows/win.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/artiq-fast/windows/win.nix b/artiq-fast/windows/win.nix index 75956cb..0b16d8a 100644 --- a/artiq-fast/windows/win.nix +++ b/artiq-fast/windows/win.nix @@ -81,17 +81,17 @@ let # ''; # }; - anaconda = winPkgs.makePkg { - name = "Anaconda3"; - src = pkgs.fetchurl { - name = "Anaconda3.exe"; - url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe"; - sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj"; - }; - installScript = '' - .\Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\ProgramData\Anaconda3" - ''; - }; + # anaconda = winPkgs.makePkg { + # name = "Anaconda3"; + # src = pkgs.fetchurl { + # name = "Anaconda3.exe"; + # url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe"; + # sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj"; + # }; + # installScript = '' + # .\Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\ProgramData\Anaconda3" + # ''; + # }; in runQemuCommand "bootstrap-win-pkgs.img" '' @@ -108,8 +108,6 @@ let # SSH setup script goes here because windows XML parser sucks cp ${autounattend.setupScript} pkgs/ssh-setup.ps1 - # cp ${anaconda} pkgs/user/00_"$(stripHash "${anaconda}")" - ${lib.concatStringsSep "\n" (builtins.map (x: ''cp ${x} pkgs/bootstrap/"$(stripHash "${x}")"'') packages)} virt-make-fs --partition --type=fat pkgs/ $out