Remove anaconda bundle

This one will be installed in a separate step incrementally
wfvm
adisbladis 2020-05-03 15:26:23 +01:00 committed by Stephan Maka
parent 3e7e6941b8
commit 6bbbd41ece
1 changed files with 11 additions and 13 deletions

View File

@ -81,17 +81,17 @@ let
# ''; # '';
# }; # };
anaconda = winPkgs.makePkg { # anaconda = winPkgs.makePkg {
name = "Anaconda3"; # name = "Anaconda3";
src = pkgs.fetchurl { # src = pkgs.fetchurl {
name = "Anaconda3.exe"; # name = "Anaconda3.exe";
url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe"; # url = "https://repo.anaconda.com/archive/Anaconda3-2019.03-Windows-x86_64.exe";
sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj"; # sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj";
}; # };
installScript = '' # installScript = ''
.\Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\ProgramData\Anaconda3" # .\Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\ProgramData\Anaconda3"
''; # '';
}; # };
in in
runQemuCommand "bootstrap-win-pkgs.img" '' runQemuCommand "bootstrap-win-pkgs.img" ''
@ -108,8 +108,6 @@ let
# SSH setup script goes here because windows XML parser sucks # SSH setup script goes here because windows XML parser sucks
cp ${autounattend.setupScript} pkgs/ssh-setup.ps1 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)} ${lib.concatStringsSep "\n" (builtins.map (x: ''cp ${x} pkgs/bootstrap/"$(stripHash "${x}")"'') packages)}
virt-make-fs --partition --type=fat pkgs/ $out virt-make-fs --partition --type=fat pkgs/ $out