From fd9fb0afd56a297d04d31eab2bd0304c885664d8 Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Sun, 24 Mar 2024 21:03:40 -0400
Subject: [PATCH] Bump shake version (#120)

---
 src/NvFetcher.hs        | 4 ++--
 src/NvFetcher/Config.hs | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/NvFetcher.hs b/src/NvFetcher.hs
index a1715d1..9ff465f 100644
--- a/src/NvFetcher.hs
+++ b/src/NvFetcher.hs
@@ -157,8 +157,8 @@ runNvFetcherNoCLI config@Config {..} target packageSet = do
   pkgs <- Map.map pinIfUnmatch <$> runPackageSet packageSet
   lastVersions <- parseLastVersions $ buildDir </> generatedJsonFileName
   shakeDir <- getDataDir
-  -- Set shakeFiles
-  let shakeOptions1 = shakeConfig {shakeFiles = shakeDir}
+  -- Set shakeFiles and shakeVersion
+  let shakeOptions1 = shakeConfig {shakeFiles = shakeDir, shakeVersion = "2"}
   -- shakeConfig in Config will be shakeOptions1 (not including shake extra)
   shakeExtras <- initShakeExtras (config {shakeConfig = shakeOptions1}) pkgs $ fromMaybe mempty lastVersions
   -- Set shakeExtra
diff --git a/src/NvFetcher/Config.hs b/src/NvFetcher/Config.hs
index 500856c..4b4262d 100644
--- a/src/NvFetcher/Config.hs
+++ b/src/NvFetcher/Config.hs
@@ -31,8 +31,7 @@ instance Default Config where
       { shakeConfig =
           shakeOptions
             { shakeProgress = progressSimple,
-              shakeThreads = 0,
-              shakeVersion = "1"
+              shakeThreads = 0
             },
         buildDir = "_sources",
         customRules = pure (),