Merge pull request #5800 from mpilgrem/ghc922

Allow stack to build with GHC 9.2.3 (nightly-2022-07-29)

src/Stack/Package.hs

@@ -56,6 +56,9 @@ import           Distribution.Types.LibraryName (libraryNameString, maybeToLibra
 #endif
 import           Distribution.Types.MungedPackageName
 import qualified Distribution.Types.UnqualComponentName as Cabal
+#if MIN_VERSION_Cabal(3,6,0)
+import           Distribution.Utils.Path (getSymbolicPath)
+#endif
 import           Distribution.Verbosity (silent)
 import           Distribution.Version (mkVersion, orLaterVersion, anyVersion)
 import qualified HiFileParser as Iface
@@ -411,7 +414,11 @@ generateBuildInfoOpts BioInput {..} =
               , [ biCabalDir
                 | null (hsSourceDirs biBuildInfo)
                 ]
+#if MIN_VERSION_Cabal(3,6,0)
+              , mapMaybe (toIncludeDir . getSymbolicPath) (hsSourceDirs biBuildInfo)
+#else
               , mapMaybe toIncludeDir (hsSourceDirs biBuildInfo)
+#endif
               , [ componentAutogen ]
               , maybeToList (packageAutogenDir biCabalVersion biDistDir)
               , [ componentOutputDir biComponentName biDistDir ]
@@ -808,7 +815,11 @@ resolveComponentFiles
     -> [DotCabalDescriptor]
     -> RIO Ctx (Map ModuleName (Path Abs File), [DotCabalPath], [PackageWarning])
 resolveComponentFiles component build names = do
+#if MIN_VERSION_Cabal(3,6,0)
+    dirs <- mapMaybeM (resolveDirOrWarn . getSymbolicPath) (hsSourceDirs build)
+#else
     dirs <- mapMaybeM resolveDirOrWarn (hsSourceDirs build)
+#endif
     dir <- asks (parent . ctxFile)
     agdirs <- autogenDirs
     (modules,files,warnings) <-

stack-ghc-922.yaml → stack-ghc-923.yaml

@@ -1,5 +1,5 @@
-# GHC 9.2.2
-resolver: nightly-2022-04-09
+# GHC 9.2.3
+resolver: nightly-2022-07-29
 
 packages:
 - .
@@ -22,7 +22,8 @@ ghc-options:
    "$locals": -fhide-source-paths
 
 extra-deps:
-- pantry-0.5.6@rev:0 # https://github.com/commercialhaskell/pantry/pull/53
+# See https://github.com/commercialhaskell/pantry/pull/53
+- pantry-0.5.6@rev:0
 
 drop-packages:
 # See https://github.com/commercialhaskell/stack/pull/4712