From c7d9060eeef46bebaf376c95ca37c7a65a2ea896 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 9 Sep 2021 20:48:48 +0800 Subject: [PATCH 1/2] vs: update --- wfvm/layers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wfvm/layers/default.nix b/wfvm/layers/default.nix index 1e80076..5a49f8c 100644 --- a/wfvm/layers/default.nix +++ b/wfvm/layers/default.nix @@ -71,8 +71,8 @@ in script = let bootstrapper = pkgs.fetchurl { name = "RESTRICTDIST-vs_Community.exe"; - url = "https://download.visualstudio.microsoft.com/download/pr/ac05c4f5-0da1-429f-8701-ce509ac69926/cc9556137c66a373670376d6db2fc5c5c937b2b0bf7b3d3cac11c69e33615511/vs_Community.exe"; - sha256 = "04amc4rrxihimhy3syxzn2r3gjf5qlpxpmkn0dkp78v6gh9md5fc"; + url = "https://download.visualstudio.microsoft.com/download/pr/343898a7-7d12-4faa-b5df-958b31e57b3e/0e17eb53023c8a4d07e1dfd201e8a0ebff2c56c74ad594c8f02521fb5b27c7db/vs_Community.exe"; + sha256 = "1ny74xdzn895y3499maaqxb2rzzbl3l03lnzw43lv2iw099yn5qf"; }; # This touchy-feely "community" piece of trash seems deliberately crafted to break Wine, so we use the VM to run it. download-vs = wfvm.utils.wfvm-run { @@ -93,7 +93,7 @@ in outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0axaym774p2w49pja1vqlx3x6fdylfjkpiybrqkyfc605r07xqyk"; + outputHash = "1c9cmcsm7qmhkhv98f1vgbfxy0jzyr4rxa1z6myx2zwq13p94pj9"; phases = [ "buildPhase" ]; buildInputs = [ download-vs ]; From a4fe5f0475c6307d8a6c3c4c75223c7849f4b937 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 14 Nov 2021 20:15:26 +0800 Subject: [PATCH 2/2] update visual studio garbage --- wfvm/layers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wfvm/layers/default.nix b/wfvm/layers/default.nix index 5a49f8c..d2b15bb 100644 --- a/wfvm/layers/default.nix +++ b/wfvm/layers/default.nix @@ -71,8 +71,8 @@ in script = let bootstrapper = pkgs.fetchurl { name = "RESTRICTDIST-vs_Community.exe"; - url = "https://download.visualstudio.microsoft.com/download/pr/343898a7-7d12-4faa-b5df-958b31e57b3e/0e17eb53023c8a4d07e1dfd201e8a0ebff2c56c74ad594c8f02521fb5b27c7db/vs_Community.exe"; - sha256 = "1ny74xdzn895y3499maaqxb2rzzbl3l03lnzw43lv2iw099yn5qf"; + url = "https://aka.ms/vs/16/release/vs_community.exe"; + sha256 = "0b3csxz0qsafnvc0d74ywfpralwz8chv4zf9k07akpm8lp8ycgq0"; }; # This touchy-feely "community" piece of trash seems deliberately crafted to break Wine, so we use the VM to run it. download-vs = wfvm.utils.wfvm-run { @@ -93,7 +93,7 @@ in outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1c9cmcsm7qmhkhv98f1vgbfxy0jzyr4rxa1z6myx2zwq13p94pj9"; + outputHash = "0ic3jvslp2y9v8yv9mfr2mafkvj2q5frmcyhmlbxj71si1x3kpag"; phases = [ "buildPhase" ]; buildInputs = [ download-vs ]; @@ -118,7 +118,7 @@ in name = "MSVC-ide-unbreak"; script = '' - win-exec 'cd "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE" && devenv /ResetSettings' + win-exec 'cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE" && devenv /ResetSettings' sleep 40 ''; };