Merge pull request #5820 from commercialhaskell/ghc-941

Author: mpilgrem

src/Stack/Package.hs

@@ -40,9 +40,14 @@ import           Distribution.ModuleName (ModuleName)
 import qualified Distribution.ModuleName as Cabal
 import           Distribution.Package hiding (Package, packageName, packageVersion, PackageIdentifier)
 import           Distribution.PackageDescription hiding (FlagName)
+#if !MIN_VERSION_Cabal(3,8,1)
 import           Distribution.PackageDescription.Parsec
+#endif
 import           Distribution.Pretty (prettyShow)
 import           Distribution.Simple.Glob (matchDirFileGlob)
+#if MIN_VERSION_Cabal(3,8,1)
+import           Distribution.Simple.PackageDescription (readHookedBuildInfo)
+#endif
 import           Distribution.System (OS (..), Arch, Platform (..))
 import           Distribution.Text (display)
 import qualified Distribution.Types.CondTree as Cabal

src/Stack/Setup.hs

@@ -475,9 +475,9 @@ warnUnsupportedCompiler ghcVersion = do
         logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648"
         logWarn ""
         pure True
-    | ghcVersion >= mkVersion [9, 3] -> do
+    | ghcVersion >= mkVersion [9, 5] -> do
         logWarn $
-          "Stack has not been tested with GHC versions above 9.2, and using " <>
+          "Stack has not been tested with GHC versions above 9.4, and using " <>
           fromString (versionString ghcVersion) <>
           ", this may fail"
         pure True
@@ -502,9 +502,9 @@ warnUnsupportedCompilerCabal cp didWarn = do
         logWarn "This invocation will most likely fail."
         logWarn "To fix this, either use an older version of Stack or a newer resolver"
         logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later"
-    | cabalVersion >= mkVersion [3, 7] ->
+    | cabalVersion >= mkVersion [3, 9] ->
         logWarn $
-          "Stack has not been tested with Cabal versions above 3.6, but version " <>
+          "Stack has not been tested with Cabal versions above 3.8, but version " <>
           fromString (versionString cabalVersion) <>
           " was found, this may fail"
     | otherwise -> pure ()
@@ -1471,7 +1471,7 @@ installGHCPosix downloadInfo _ archiveFile archiveType tempDir destDir = do
     -- Data.Map.union provides a left-biased union, so mGccEnv will prevail
     let ghcConfigureEnv =
           fromMaybe Map.empty mGccEnv `Map.union` gdiConfigureEnv downloadInfo
-    
+
     logSticky "Configuring GHC ..."
     runStep "configuring" dir
         ghcConfigureEnv