stack: allow ghc-8.8 and Cabal-3.0 without warnings
This commit is contained in:
parent
e6cf6db2c1
commit
3cb7a8fb81
@ -48,6 +48,7 @@ Source20: https://hackage.haskell.org/package/%{inferlicense}/%{inferlicen
|
|||||||
Source21: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz
|
Source21: https://hackage.haskell.org/package/%{rioorphans}/%{rioorphans}.tar.gz
|
||||||
Source22: https://hackage.haskell.org/package/%{thutilities}/%{thutilities}.tar.gz
|
Source22: https://hackage.haskell.org/package/%{thutilities}/%{thutilities}.tar.gz
|
||||||
# End cabal-rpm sources
|
# End cabal-rpm sources
|
||||||
|
Patch0: stack-2.1-relax_version_warnings.patch
|
||||||
|
|
||||||
BuildRequires: ghc
|
BuildRequires: ghc
|
||||||
BuildRequires: alex
|
BuildRequires: alex
|
||||||
@ -234,6 +235,7 @@ Stack is a cross-platform program for developing Haskell projects.
|
|||||||
# Begin cabal-rpm setup:
|
# Begin cabal-rpm setup:
|
||||||
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a20 -a21 -a22
|
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a20 -a21 -a22
|
||||||
# End cabal-rpm setup
|
# End cabal-rpm setup
|
||||||
|
%patch0 -b .orig
|
||||||
(
|
(
|
||||||
cd %{regexapplicativetext}
|
cd %{regexapplicativetext}
|
||||||
cabal-tweak-dep-ver base '<4.10' '<4.13'
|
cabal-tweak-dep-ver base '<4.10' '<4.13'
|
||||||
|
28
stack-2.1-relax_version_warnings.patch
Normal file
28
stack-2.1-relax_version_warnings.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
--- stack-2.1.3.1/src/Stack/Setup.hs~ 2019-07-14 12:22:56.000000000 +0800
|
||||||
|
+++ stack-2.1.3.1/src/Stack/Setup.hs 2020-04-12 11:56:39.453839733 +0800
|
||||||
|
@@ -482,9 +482,9 @@
|
||||||
|
logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648"
|
||||||
|
logWarn ""
|
||||||
|
pure True
|
||||||
|
- | ghcVersion >= mkVersion [8, 7] -> do
|
||||||
|
+ | ghcVersion >= mkVersion [8, 9] -> do
|
||||||
|
logWarn $
|
||||||
|
- "Stack has not been tested with GHC versions above 8.6, and using " <>
|
||||||
|
+ "Stack has not been tested with GHC versions above 8.8, and using " <>
|
||||||
|
fromString (versionString ghcVersion) <>
|
||||||
|
", this may fail"
|
||||||
|
pure True
|
||||||
|
@@ -509,9 +509,9 @@
|
||||||
|
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 [2, 5] ->
|
||||||
|
+ | cabalVersion >= mkVersion [3, 1] ->
|
||||||
|
logWarn $
|
||||||
|
- "Stack has not been tested with Cabal versions above 2.4, but version " <>
|
||||||
|
+ "Stack has not been tested with Cabal versions above 3.0, but version " <>
|
||||||
|
fromString (versionString cabalVersion) <>
|
||||||
|
" was found, this may fail"
|
||||||
|
| otherwise -> pure ()
|
||||||
|
|
||||||
|
Diff finished. Sun Apr 12 11:56:54 2020
|
Loading…
Reference in New Issue
Block a user