Merge pull request #1452 from akhesaCaro/unsupport_old_ghc

Unsupport GHC < 8.6.5
This commit is contained in:
Caroline GAUDREAU 2021-10-02 13:41:42 +02:00 committed by GitHub
commit 0b706aa6d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 47 additions and 112 deletions

View file

@ -15,9 +15,6 @@ jobs:
os: [ubuntu-latest]
cabal: ["3.4"]
ghc:
- "8.0.2"
- "8.2.2"
- "8.4.4"
- "8.6.5"
- "8.8.4"
- "8.10.4"

View file

@ -1,32 +0,0 @@
# With common maintenance tasks
HC ?= ghc-8.4.4
all :
@echo "Don't try to make all at once!"
really-all :
$(MAKE) build-ghc
$(MAKE) build-ghc HC=ghc-8.0.2
$(MAKE) build-ghc HC=ghc-8.2.2
$(MAKE) build-ghc HC=ghc-8.6.5
$(MAKE) build-ghcjs
build-ghc :
cabal v2-build -w $(HC) all
build-ghcjs :
cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all
packdeps :
packdeps */*.cabal
doctest : doctest-servant doctest-servant-server
perl -i -e 'while (<ARGV>) { print unless /package-id\s+base-compat-\d+(\.\d+)*/; }' .ghc.environment.*
doctest-servant :
(cd servant && doctest src)
(cd servant && doctest test/Servant/LinksSpec.hs)
doctest-servant-server :
(cd servant-server && doctest src)

View file

@ -7,3 +7,5 @@ packages:
-- we need to tell cabal we are using GHCJS
compiler: ghcjs
tests: True
constraints: hashable <=1.3.3.0

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-basic-auth
main-is: BasicAuth.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-basic-streaming
main-is: Streaming.lhs

View file

@ -24,7 +24,6 @@ Language extensions and imports:
import Control.Lens ((^.))
import Data.Aeson
import Data.Aeson.Text
import Data.Monoid ((<>))
import Data.Proxy (Proxy (Proxy))
import Data.Text (Text)
import Data.Text.Encoding (decodeUtf8)

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbock-curl-mock
main-is: CurlMock.lhs

View file

@ -20,7 +20,6 @@ Extensions and imports:
import Data.Aeson
import Data.Proxy
import Data.Text
import Data.Semigroup
import GHC.Generics
import Network.Wai
import Network.Wai.Handler.Warp

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-custom-errors
main-is: CustomErrors.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-db-postgres-pool
main-is: PostgresPool.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-db-sqlite-simple
main-is: DBConnection.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-file-upload
main-is: FileUpload.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-using-custom-monad
main-is: Generic.lhs

View file

@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
category: Servant
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-hoist-server-with-context
main-is: HoistServerWithContext.lhs
@ -32,8 +32,6 @@ executable cookbook-hoist-server-with-context
, http-types >= 0.12
, bytestring >= 0.10.4
, mtl
if impl(ghc < 8.2.1)
buildable: False
default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit
build-tool-depends: markdown-unlit:markdown-unlit

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-https
main-is: Https.lhs

View file

@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
category: Servant
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-jwt-and-basic-auth
main-is: JWTAndBasicAuth.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >= 1.10
tested-with: GHC==8.4.4, GHC==8.6.5
tested-with: GHC==8.6.5
executable cookbook-openidconnect
main-is: OpenIdConnect.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-pagination
main-is: Pagination.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-sentry
main-is: Sentry.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-structuring-apis
main-is: StructuringApis.lhs

View file

@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
category: Servant
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-testing
main-is: Testing.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-using-custom-monad
main-is: UsingCustomMonad.lhs

View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1
executable cookbook-using-free-client
main-is: UsingFreeClient.lhs

View file

@ -28,8 +28,6 @@ executable cookbook-uverb
, swagger2
, wai
, warp
if impl(ghc < 8.6.1)
buildable: False
default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit
build-tool-depends: markdown-unlit:markdown-unlit

View file

@ -47,7 +47,6 @@ module Authentication where
import Data.Aeson (ToJSON)
import Data.ByteString (ByteString)
import Data.Map (Map, fromList)
import Data.Monoid ((<>))
import qualified Data.Map as Map
import Data.Proxy (Proxy (Proxy))
import Data.Text (Text)

View file

@ -13,9 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple
cabal-version: >=1.10
tested-with:
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.3, GHC ==8.10.1
extra-source-files:

View file

@ -23,7 +23,18 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD
```
**Possible GHC versions**
- `ghc822Binary`
- `ghc865`
- `ghc865Binary`
- `ghc884`
- `ghc8102` - default
- `ghc8104` - default
### Cabal users
GHC version can be chosen via the nix-shell parameter
`cabal build all`
### Stack version
Since the ghc version is set by the LTS version, it is preferable to use the `ghc8104` version parameter for the nix-shell.
`stack --no-nix --system-ghc <command>`

View file

@ -1,9 +1,7 @@
let nixos = fetchTarball {
url = "https://releases.nixos.org/nixos/20.09/nixos-20.09.3505.12d9950bf47/nixexprs.tar.xz";
sha256 = "0fsl8bsdb8i536pfs4wrp0826h5l84xqlwx32sbz66jg4ykqp9lr";
let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz";
}; in
{ compiler ? "ghc8102"
{ compiler ? "ghc8104"
, tutorial ? false
, pkgs ? import nixos { config = {}; }
}:
@ -16,7 +14,7 @@ let nixos = fetchTarball {
in
stdenv.mkDerivation {
name = "servant-dev";
buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl ]
buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl stack haskellPackages.hspec-discover ]
++ (if tutorial then [docstuffs postgresql] else []);
shellHook = ''
eval $(grep export ${ghc}/bin/ghc)

View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
, GHCJS == 8.4
extra-source-files:

View file

@ -9,8 +9,6 @@ module Servant.Client.Core.BasicAuth (
import Data.ByteString.Base64
(encode)
import Data.Monoid
((<>))
import Data.Text.Encoding
(decodeUtf8)
import Servant.API.BasicAuth

View file

@ -35,8 +35,6 @@ import Data.Bitraversable
import qualified Data.ByteString as BS
import qualified Data.ByteString.Builder as Builder
import qualified Data.ByteString.Lazy as LBS
import Data.Semigroup
((<>))
import qualified Data.Sequence as Seq
import Data.Text
(Text)

View file

@ -20,7 +20,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
extra-source-files:
CHANGELOG.md

View file

@ -53,8 +53,6 @@ import Data.Maybe
(maybe, maybeToList)
import Data.Proxy
(Proxy (..))
import Data.Semigroup
((<>))
import Data.Sequence
(fromList)
import Data.String

View file

@ -21,8 +21,6 @@ import Prelude ()
import Prelude.Compat
import Data.Monoid ()
import Data.Semigroup
((<>))
import qualified Network.HTTP.Types as HTTP
import Test.Hspec

View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2
extra-source-files:
CHANGELOG.md

View file

@ -19,7 +19,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
extra-source-files:
CHANGELOG.md

View file

@ -52,8 +52,6 @@ import Data.Ord
(comparing)
import Data.Proxy
(Proxy (Proxy))
import Data.Semigroup
(Semigroup (..))
import Data.String.Conversions
(cs)
import Data.Text

View file

@ -21,7 +21,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2015-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
extra-source-files:
CHANGELOG.md

View file

@ -13,7 +13,6 @@ module Servant.Foreign.Inflections
import Control.Lens hiding
(cons)
import qualified Data.Char as C
import Data.Monoid
import Data.Text hiding
(map)
import Prelude hiding

View file

@ -23,8 +23,6 @@ import Control.Lens
import Data.Data
(Data)
import Data.Proxy
import Data.Semigroup
(Semigroup)
import Data.String
import Data.Text
import Data.Text.Encoding

View file

@ -11,8 +11,6 @@
module Servant.ForeignSpec where
import Data.Monoid
((<>))
import Data.Proxy
import Servant.Foreign
import Servant.Test.ComprehensiveAPI

View file

@ -20,7 +20,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
extra-source-files:
CHANGELOG.md

View file

@ -49,8 +49,6 @@ import Data.Maybe
(maybeToList)
import Data.Proxy
(Proxy (..))
import Data.Semigroup
((<>))
import Data.Sequence
(fromList)
import Data.String

View file

@ -44,8 +44,6 @@ import Data.Maybe
(isJust)
import Data.Monoid ()
import Data.Proxy
import Data.Semigroup
((<>))
import GHC.Generics
(Generic)
import qualified Network.HTTP.Types as HTTP

View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2
extra-source-files:
CHANGELOG.md

View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2
extra-source-files:
CHANGELOG.md

View file

@ -23,7 +23,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
extra-source-files:
CHANGELOG.md

View file

@ -46,8 +46,6 @@ import Data.Either
(partitionEithers)
import Data.Maybe
(fromMaybe, isNothing, mapMaybe, maybeToList)
import Data.Semigroup
((<>))
import Data.String
(IsString (..))
import Data.String.Conversions

View file

@ -12,8 +12,6 @@ import Control.Monad.Trans
import qualified Data.ByteString as BS
import Data.ByteString.Base64
(decodeLenient)
import Data.Monoid
((<>))
import Data.Typeable
(Typeable)
import Data.Word8

View file

@ -12,8 +12,6 @@ import Data.Aeson
(encode)
import qualified Data.ByteString.Char8 as BC
import qualified Data.ByteString.Lazy.Char8 as BCL
import Data.Monoid
((<>))
import Data.Proxy
import Data.String.Conversions
(cs)

View file

@ -20,7 +20,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
, GHCJS == 8.4
extra-source-files:

View file

@ -16,8 +16,6 @@ import Data.Bifunctor
(Bifunctor (..))
import Data.Bitraversable
(Bitraversable (..))
import Data.Semigroup
(Semigroup (..))
import Data.Typeable
(Typeable)
import Prelude ()

View file

@ -47,8 +47,6 @@ import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Lazy.Char8 as LBS8
import Data.List.NonEmpty
(NonEmpty (..))
import Data.Monoid
((<>))
import Data.Proxy
(Proxy)
import Data.Typeable

View file

@ -127,8 +127,6 @@ module Servant.Links (
import Data.List
import Data.Proxy
(Proxy (..))
import Data.Semigroup
((<>))
import Data.Singletons.Bool
(SBool (..), SBoolI (..))
import qualified Data.Text as Text