M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

Fix conda base package 

I'm not sure whether to include this in the default image so it's
uncommented for now
This commit is contained in:
adisbladis 2020-02-13 00:51:45 +00:00 committed by Stephan Maka
parent b410bd6b35
commit 23e9666550
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq-fast/windows/win.nix
View File

@ -65,15 +65,15 @@ let
bootstrapPkgs = let
winPkgs = import ./pkgs.nix { inherit pkgs; };
nuget = winPkgs.makePkg {
name = "nuget-dll";
src = ./nuget/Microsoft.PackageManagement.NuGetProvider.dll;
installScript = ''
mkdir -f "C:\Program Files\PackageManagement\ProviderAssemblies\nuget\2.8.5.208"
cp "Microsoft.PackageManagement.NuGetProvider.dll" "C:\Program Files\PackageManagement\ProviderAssemblies\nuget\2.8.5.208"
Import-PackageProvider -Name NuGet -RequiredVersion 2.8.5.201
'';
};
# nuget = winPkgs.makePkg {
# name = "nuget-dll";
# src = ./nuget/Microsoft.PackageManagement.NuGetProvider.dll;
# installScript = ''
# mkdir -f "C:\Program Files\PackageManagement\ProviderAssemblies\nuget\2.8.5.208"
# cp "Microsoft.PackageManagement.NuGetProvider.dll" "C:\Program Files\PackageManagement\ProviderAssemblies\nuget\2.8.5.208"
# Import-PackageProvider -Name NuGet -RequiredVersion 2.8.5.201
# '';
# };
anaconda = winPkgs.makePkg {
name = "Anaconda3";
@ -83,7 +83,7 @@ let
sha256 = "1f9icm5rwab6l1f23a70dw0qixzrl62wbglimip82h4zhxlh3jfj";
};
installScript = ''
Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\Program Files\\Anaconda3"
.\Anaconda3.exe /InstallationType=AllUsers /RegisterPython=0 /S /D="C:\ProgramData\Anaconda3"
'';
};
@ -91,6 +91,7 @@ let
runQemuCommand "bootstrap-win-pkgs.img" ''
mkdir pkgs
mkdir pkgs/bootstrap
mkdir pkgs/user
mkdir pkgs/fod
cp ${bundleInstaller} pkgs/"$(stripHash "${bundleInstaller}")"
@ -101,8 +102,7 @@ let
# SSH setup script goes here because windows XML parser sucks
cp ${autounattend.setupScript} pkgs/ssh-setup.ps1
# cp ${nuget} pkgs/bootstrap/00_"$(stripHash "${nuget}")"
# cp ${anaconda} pkgs/bootstrap/00_"$(stripHash "${anaconda}")"
# cp ${anaconda} pkgs/user/00_"$(stripHash "${anaconda}")"
${lib.concatStringsSep "\n" (builtins.map (x: ''cp ${x} pkgs/bootstrap/"$(stripHash "${x}")"'') packages)}