diff --git a/artiq-fast/windows/win.nix b/artiq-fast/windows/win.nix index 960975f..48eb2c3 100644 --- a/artiq-fast/windows/win.nix +++ b/artiq-fast/windows/win.nix @@ -43,24 +43,6 @@ let openSshServerPackage = ./openssh/server-package.cab; - # pkgs.fetchurl { - # name = "OpenSSH-Server-Package~31bf3856ad364e35~amd64~~.cab"; - # url = "http://download.windowsupdate.com/c/msdownload/update/software/updt/2018/04/openssh-server-package~31bf3856ad364e35~amd64~~_b264949145379b61d55448ed2625916457f701ba.cab"; - # sha256 = "1pzaz2i7x05ki6gq7yxh0j4c1l6r57hawl3ggkji0r83wzrmh7ps"; - # }; - # openSshClientPackage = pkgs.fetchurl { - # name = "OpenSSH-Client-Package-31bf3856ad364e35-AMD64.cab"; - # url = "http://download.windowsupdate.com/d/msdownload/update/software/updt/2018/04/openssh-client-package~31bf3856ad364e35~amd64~~_715b60a3869c393e0c03fd5683fe88c6f155ce28.cab"; - # sha256 = "1rfdh2b47y27smy91g19s82cfwp8x5wg2iri95b8ndi9mplyfqdd"; - # }; - - # Note: We're not using this one but keep around as a reference since microsoft makes it near impossible to find - # URLs for these kind of things - # fodIso = pkgs.fetchurl { - # url = "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_amd64fre_SERVER-FOD-PACKAGES_OEM_amd64fre_MULTI.iso"; - # sha256 = "009pygycwvfkbm02zycp9zv136qc2lcljjjp0021fjd2kn3mf6k9"; - # }; - autounattend = import ./autounattend.nix ( attrs // { inherit pkgs; @@ -73,28 +55,6 @@ 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 - # ''; - # }; - - # 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" '' mkdir pkgs