Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump shake version #120

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Bump shake version #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/NvFetcher.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/NvFetcher/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ instance Default Config where
{ shakeConfig =
shakeOptions
{ shakeProgress = progressSimple,
shakeThreads = 0,
shakeVersion = "1"
shakeThreads = 0
},
buildDir = "_sources",
customRules = pure (),
Expand Down
Loading