Merge pull request #6833 from commercialhaskell/fix6832

Fix #6832 Eliminate duplicate hashing on Windows

Author: mpilgrem

ChangeLog.md

@@ -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:

src/Stack/Types/EnvConfig.hs

@@ -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.
@@ -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 ::