From cfd162657580c053e6eaa79e0d8756c9d90079f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mar 21 2022 09:38:35 +0000 Subject: silence the warnings about ghc-9.2 and Cabal-3.6 --- diff --git a/haskell-platform.spec b/haskell-platform.spec index 470d46a..73c51f8 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -24,7 +24,7 @@ Name: haskell-platform Version: 2022.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Standard Haskell distribution License: BSD @@ -46,6 +46,7 @@ Source11: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}. Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.tar.gz Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz # End cabal-rpm sources +Patch0: stack-2.7.5-ghc-Cabal-version-warnings.patch BuildRequires: ghc BuildRequires: alex @@ -233,6 +234,7 @@ Stack is a cross-platform program for developing Haskell projects. # Begin cabal-rpm setup: %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 # End cabal-rpm setup +%patch0 -p0 -b .orig %build @@ -269,7 +271,10 @@ mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ %changelog -* Mon Mar 21 2022 Jens Petersen - 2022.1-16 +* Mon Mar 21 2022 Jens Petersen - 2022.1-17 +- silence the warnings about ghc-9.2 and Cabal-3.6 + +* Sun Mar 20 2022 Jens Petersen - 2022.1-16 - https://hackage.haskell.org/package/stack-2.7.5/changelog - drop regex-applicative-text library diff --git a/stack-2.7.5-ghc-Cabal-version-warnings.patch b/stack-2.7.5-ghc-Cabal-version-warnings.patch new file mode 100644 index 0000000..08925f9 --- /dev/null +++ b/stack-2.7.5-ghc-Cabal-version-warnings.patch @@ -0,0 +1,20 @@ +--- stack-2.7.5/src/Stack/Setup.hs~ 2022-03-05 08:13:02.000000000 +0800 ++++ stack-2.7.5/src/Stack/Setup.hs 2022-03-21 17:34:33.423272288 +0800 +@@ -468,7 +468,7 @@ + logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648" + logWarn "" + pure True +- | ghcVersion >= mkVersion [9, 1] -> do ++ | ghcVersion >= mkVersion [9, 3] -> do + logWarn $ + "Stack has not been tested with GHC versions above 9.0, and using " <> + fromString (versionString ghcVersion) <> +@@ -495,7 +495,7 @@ + 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, 5] -> ++ | cabalVersion >= mkVersion [3, 7] -> + logWarn $ + "Stack has not been tested with Cabal versions above 3.4, but version " <> + fromString (versionString cabalVersion) <>