eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1452 from akhesaCaro/unsupport_old_ghc

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/master.yml vendored
View file

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

32
Makefile
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)

2
cabal.ghcjs.project
View file

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

2
doc/cookbook/basic-auth/basic-auth.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-basic-auth
main-is: BasicAuth.lhs main-is: BasicAuth.lhs

2
doc/cookbook/basic-streaming/basic-streaming.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-basic-streaming
main-is: Streaming.lhs main-is: Streaming.lhs

1
doc/cookbook/curl-mock/CurlMock.lhs
View file

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

2
doc/cookbook/curl-mock/curl-mock.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbock-curl-mock
main-is: CurlMock.lhs main-is: CurlMock.lhs

1
doc/cookbook/custom-errors/CustomErrors.lhs
View file

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

2
doc/cookbook/custom-errors/custom-errors.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-custom-errors
main-is: CustomErrors.lhs main-is: CustomErrors.lhs

2
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-db-postgres-pool
main-is: PostgresPool.lhs main-is: PostgresPool.lhs

2
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-db-sqlite-simple
main-is: DBConnection.lhs main-is: DBConnection.lhs

2
doc/cookbook/file-upload/file-upload.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-file-upload
main-is: FileUpload.lhs main-is: FileUpload.lhs

2
doc/cookbook/generic/generic.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-using-custom-monad
main-is: Generic.lhs main-is: Generic.lhs

4
doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
View file

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

2
doc/cookbook/https/https.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-https
main-is: Https.lhs main-is: Https.lhs

2
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
View file

@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
category: Servant category: Servant
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-jwt-and-basic-auth
main-is: JWTAndBasicAuth.lhs main-is: JWTAndBasicAuth.lhs

2
doc/cookbook/open-id-connect/OpenIdConnect.cabal
View file

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

2
doc/cookbook/pagination/pagination.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-pagination
main-is: Pagination.lhs main-is: Pagination.lhs

2
doc/cookbook/sentry/sentry.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-sentry
main-is: Sentry.lhs main-is: Sentry.lhs

2
doc/cookbook/structuring-apis/structuring-apis.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-structuring-apis
main-is: StructuringApis.lhs main-is: StructuringApis.lhs

2
doc/cookbook/testing/testing.cabal
View file

@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
category: Servant category: Servant
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-testing
main-is: Testing.lhs main-is: Testing.lhs

2
doc/cookbook/using-custom-monad/using-custom-monad.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-using-custom-monad
main-is: UsingCustomMonad.lhs main-is: UsingCustomMonad.lhs

2
doc/cookbook/using-free-client/using-free-client.cabal
View file

@ -8,7 +8,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 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 executable cookbook-using-free-client
main-is: UsingFreeClient.lhs main-is: UsingFreeClient.lhs

2
doc/cookbook/uverb/uverb.cabal
View file

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

1
doc/tutorial/Authentication.lhs
View file

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

3
doc/tutorial/tutorial.cabal
View file

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

17
nix/README.md
View file

@ -23,7 +23,18 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD
``` ```
**Possible GHC versions** **Possible GHC versions**
- `ghc822Binary` - `ghc865Binary`
- `ghc865`
- `ghc884` - `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>`

8
nix/shell.nix
View file

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

2
servant-client-core/servant-client-core.cabal
View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple 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 , GHCJS == 8.4
extra-source-files: extra-source-files:

2
servant-client-core/src/Servant/Client/Core/BasicAuth.hs
View file

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

2
servant-client-core/src/Servant/Client/Core/Request.hs
View file

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

2
servant-client/servant-client.cabal
View file

@ -20,7 +20,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-client/src/Servant/Client/Internal/HttpClient.hs
View file

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

2
servant-client/test/Servant/FailSpec.hs
View file

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

2
servant-conduit/servant-conduit.cabal
View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors copyright: 2018-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-docs/servant-docs.cabal
View file

@ -19,7 +19,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-docs/src/Servant/Docs/Internal.hs
View file

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

2
servant-foreign/servant-foreign.cabal
View file

@ -21,7 +21,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2015-2019 Servant Contributors copyright: 2015-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

1
servant-foreign/src/Servant/Foreign/Inflections.hs
View file

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

2
servant-foreign/src/Servant/Foreign/Internal.hs
View file

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

2
servant-foreign/test/Servant/ForeignSpec.hs
View file

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

2
servant-http-streams/servant-http-streams.cabal
View file

@ -20,7 +20,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2019 Servant Contributors copyright: 2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-http-streams/src/Servant/HttpStreams/Internal.hs
View file

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

2
servant-http-streams/test/Servant/ClientSpec.hs
View file

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

2
servant-machines/servant-machines.cabal
View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors copyright: 2018-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-pipes/servant-pipes.cabal
View file

@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2018-2019 Servant Contributors copyright: 2018-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-server/servant-server.cabal
View file

@ -23,7 +23,7 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple 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: extra-source-files:
CHANGELOG.md CHANGELOG.md

2
servant-server/src/Servant/Server/Internal.hs
View file

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

2
servant-server/src/Servant/Server/Internal/BasicAuth.hs
View file

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

2
servant-server/test/Servant/Server/ErrorSpec.hs
View file

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

2
servant/servant.cabal
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 copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple 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 , GHCJS == 8.4
extra-source-files: extra-source-files:

2
servant/src/Servant/API/Alternative.hs
View file

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

2
servant/src/Servant/API/Stream.hs
View file

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

2
servant/src/Servant/Links.hs
View file

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