Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Major changes:

Behavior changes:

* On Windows, the path segment _platform_\\_hash_\\_ghc version_, under
`.stack-work\install` and `.stack-work\hoogle`, is hashed only once, rather
than twice.

Other enhancements:

Bug fixes:
Expand Down
9 changes: 4 additions & 5 deletions src/Stack/Types/EnvConfig.hs
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,18 @@ snapshotsDir = do
pure $ root </> relDirSnapshots </> platform
{-# DEPRECATED snapshotsDir "Not used by Stack >= 1.0.4. May be removed from a future version of stack." #-}

-- | Installation root for dependencies
-- | Installation root for dependencies.
installationRootDeps :: HasEnvConfig env => RIO env (Path Abs Dir)
installationRootDeps = do
root <- view stackRootL
-- TODO: also useShaPathOnWindows here, once #1173 is resolved.
psc <- platformSnapAndCompilerRel
pure $ root </> relDirSnapshots </> psc

-- | Installation root for locals
-- | Installation root for locals.
installationRootLocal :: HasEnvConfig env => RIO env (Path Abs Dir)
installationRootLocal = do
workDir <- getWorkDir
psc <- useShaPathOnWindows =<< platformSnapAndCompilerRel
psc <- platformSnapAndCompilerRel
pure $ workDir </> relDirInstall </> psc

-- | Get the hoogle database path.
Expand Down Expand Up @@ -215,7 +214,7 @@ bindirCompilerTools = do
hoogleRoot :: HasEnvConfig env => RIO env (Path Abs Dir)
hoogleRoot = do
workDir <- getWorkDir
psc <- useShaPathOnWindows =<< platformSnapAndCompilerRel
psc <- platformSnapAndCompilerRel
pure $ workDir </> relDirHoogle </> psc

compilerVersionDir ::
Expand Down