Merge pull request #5571 from felixonmars/ghc9

Fix compatibility with GHC 9

Author: snoyberg

src/Stack/Build/Execute.hs

@@ -997,7 +997,7 @@ withLockedDistDir announce root inner = do
               announce $ "still blocking for directory lock on " <>
                          fromString (toFilePath lockFP) <>
                          "; maybe another Stack process is running?"
-      withCompanion complainer $
+      withCompanion (\x -> complainer x) $
         \stopComplaining ->
         withRunInIO $ \run ->
         withFileLock (toFilePath lockFP) Exclusive $ \_ ->

src/Stack/Storage/Project.hs

@@ -93,8 +93,9 @@ withProjectStorage ::
        (HasBuildConfig env, HasLogFunc env)
     => ReaderT SqlBackend (RIO env) a
     -> RIO env a
-withProjectStorage inner =
-    flip SQLite.withStorage_ inner =<< view (buildConfigL . to bcProjectStorage . to unProjectStorage)
+withProjectStorage inner = do
+    storage <- view (buildConfigL . to bcProjectStorage . to unProjectStorage)
+    SQLite.withStorage_ storage inner
 
 -- | Key used to retrieve configuration or flag cache
 type ConfigCacheKey = Unique ConfigCacheParent

src/Stack/Storage/User.hs

@@ -134,8 +134,9 @@ withUserStorage ::
        (HasConfig env, HasLogFunc env)
     => ReaderT SqlBackend (RIO env) a
     -> RIO env a
-withUserStorage inner =
-    flip SQLite.withStorage_ inner =<< view (configL . to configUserStorage . to unUserStorage)
+withUserStorage inner = do
+    storage <- view (configL . to configUserStorage . to unUserStorage)
+    SQLite.withStorage_ storage inner
 
 -- | Key used to retrieve the precompiled cache
 type PrecompiledCacheKey = Unique PrecompiledCacheParent