diff --git a/haskell-platform.spec b/haskell-platform.spec index 9420b41..233c67e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -50,6 +50,7 @@ Source20: stack-symlink-distro-ghc # https://github.com/commercialhaskell/stack/issues/5866 # https://github.com/commercialhaskell/stack/pull/6028 Patch0: 6028-2.9.3.1.patch +Patch1: stack-disable-ghc-Cabal-version-warnings.patch BuildRequires: ghc BuildRequires: alex @@ -481,6 +482,7 @@ rm %{buildroot}%{_licensedir}/%{name}/LICENSE * Tue Aug 8 2023 Jens Petersen - 2023.1-25 - bring back the stack InvalidAbsFile patch updated for 2.9.3 https://github.com/commercialhaskell/stack/pull/6028 +- disable warnings about untested ghc and Cabal versions * Sat Jul 29 2023 Jens Petersen - 2023.1-24 - stack-2.9.3.1 diff --git a/stack-disable-ghc-Cabal-version-warnings.patch b/stack-disable-ghc-Cabal-version-warnings.patch new file mode 100644 index 0000000..2bedd29 --- /dev/null +++ b/stack-disable-ghc-Cabal-version-warnings.patch @@ -0,0 +1,38 @@ +--- stack-2.9.3.1/src/Stack/Setup.hs~ 2023-06-22 18:40:54.000000000 +0800 ++++ stack-2.9.3.1/src/Stack/Setup.hs 2023-08-08 14:29:43.486062926 +0800 +@@ -719,12 +719,12 @@ + logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" + logWarn "" + pure True +- | ghcVersion >= mkVersion [9, 5] -> do +- logWarn $ +- "Stack has not been tested with GHC versions above 9.4, and using " <> +- fromString (versionString ghcVersion) <> +- ", this may fail" +- pure True ++ -- | ghcVersion >= mkVersion [9, 5] -> do ++ -- logWarn $ ++ -- "Stack has not been tested with GHC versions above 9.4, and using " <> ++ -- fromString (versionString ghcVersion) <> ++ -- ", this may fail" ++ -- pure True + | otherwise -> do + logDebug "Asking for a supported GHC version" + pure False +@@ -746,11 +746,11 @@ + 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, 9] -> +- logWarn $ +- "Stack has not been tested with Cabal versions above 3.8, but version " <> +- fromString (versionString cabalVersion) <> +- " was found, this may fail" ++ -- | cabalVersion >= mkVersion [3, 9] -> ++ -- logWarn $ ++ -- "Stack has not been tested with Cabal versions above 3.8, but version " <> ++ -- fromString (versionString cabalVersion) <> ++ -- " was found, this may fail" + | otherwise -> pure () + + -- | Ensure that the msys toolchain is installed if necessary and