Skip to content

Commit 7d41fc7

Browse files
authored
Merge pull request #5243 from commercialhaskell/allow-ghc810
Remove warning about GHC 8.10/Cabal 3.2
2 parents 8468f63 + 8b3c38a commit 7d41fc7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Other enhancements:
5959
`ls dependencies --tree` is now `ls dependencies tree`. See
6060
[#4424](https://github.com/commercialhaskell/stack/pull/4424)
6161

62-
* Remove warning for using Stack with GHC 8.8 and Cabal 3.0.
62+
* Remove warning for using Stack with GHC 8.8-8.10, and Cabal 3.0-3.2.
6363

6464
* Allow relative paths in `--setup-info-yaml` and tool paths
6565
[#3394](https://github.com/commercialhaskell/stack/issues/3394)

src/Stack/Setup.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,9 @@ warnUnsupportedCompiler ghcVersion = do
465465
logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648"
466466
logWarn ""
467467
pure True
468-
| ghcVersion >= mkVersion [8, 9] -> do
468+
| ghcVersion >= mkVersion [8, 11] -> do
469469
logWarn $
470-
"Stack has not been tested with GHC versions above 8.8, and using " <>
470+
"Stack has not been tested with GHC versions above 8.10, and using " <>
471471
fromString (versionString ghcVersion) <>
472472
", this may fail"
473473
pure True
@@ -492,9 +492,9 @@ warnUnsupportedCompilerCabal cp didWarn = do
492492
logWarn "This invocation will most likely fail."
493493
logWarn "To fix this, either use an older version of Stack or a newer resolver"
494494
logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later"
495-
| cabalVersion >= mkVersion [3, 1] ->
495+
| cabalVersion >= mkVersion [3, 3] ->
496496
logWarn $
497-
"Stack has not been tested with Cabal versions above 3.0, but version " <>
497+
"Stack has not been tested with Cabal versions above 3.2, but version " <>
498498
fromString (versionString cabalVersion) <>
499499
" was found, this may fail"
500500
| otherwise -> pure ()

0 commit comments

Comments
 (0)