From 680d70094f4dc1ad21946c2ce2604e1e59a922e7 Mon Sep 17 00:00:00 2001
From: Astro <sm@m-labs.hk>
Date: Wed, 30 Jun 2021 23:50:54 +0200
Subject: [PATCH] update windowsImage to Windows 10-21H1

---
 wfvm/demo-image.nix | 13 ++++++++-----
 wfvm/win.nix        |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/wfvm/demo-image.nix b/wfvm/demo-image.nix
index 183f65c..a928de1 100644
--- a/wfvm/demo-image.nix
+++ b/wfvm/demo-image.nix
@@ -8,9 +8,10 @@ wfvm.makeWindowsImage {
   inherit impureMode;
 
   # Custom base iso
-  # windowsImage = pkgs.fetchurl {
-  #   url = "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
-  #   sha256 = "668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a";
+  # windowsImage = pkgs.requireFile rec {
+  #   name = "Win10_21H1_English_x64.iso";
+  #   sha256 = "1sl51lnx4r6ckh5fii7m2hi15zh8fh7cf7rjgjq9kacg8hwyh4b9";
+  #   message = "Get ${name} from https://www.microsoft.com/en-us/software-download/windows10ISO";
   # };
 
   # impureShellCommands = [
@@ -57,8 +58,10 @@ wfvm.makeWindowsImage {
   #   };
   # };
 
-  # License key
-  # productKey = "iboughtthisone";
+  # License key (required)
+  # productKey = throw "Search the f* web"
+  imageSelection = "Windows 10 Pro";
+
 
   # Locales
   # uiLanguage = "en-US";
diff --git a/wfvm/win.nix b/wfvm/win.nix
index a8f24a7..0e153e4 100644
--- a/wfvm/win.nix
+++ b/wfvm/win.nix
@@ -35,10 +35,10 @@ let
       )
   );
 
-  windowsIso = if windowsImage != null then windowsImage else pkgs.fetchurl {
-    name = "RESTRICTDIST-release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
-    url = "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso";
-    sha256 = "668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a";
+  windowsIso = if windowsImage != null then windowsImage else pkgs.requireFile rec {
+    name = "Win10_21H1_English_x64.iso";
+    sha256 = "1sl51lnx4r6ckh5fii7m2hi15zh8fh7cf7rjgjq9kacg8hwyh4b9";
+    message = "Get ${name} from https://www.microsoft.com/en-us/software-download/windows10ISO";
   };
 
   # stable as of 2021-04-08