0b706aa · typeable/servant

.github/workflows/master.yml−3

compare with master

unifiedsplit

@@ -15,9 +15,6 @@ jobs:

15 os: [ubuntu-latest]

16 cabal: ["3.4"]

17 ghc:

18− - "8.0.2"

19− - "8.2.2"

20− - "8.4.4"

21 - "8.6.5"

18 - "8.6.5"

22 - "8.8.4"

19 - "8.8.4"

23 - "8.10.4"

20 - "8.10.4"

Makefiledeleted−32

@@ -1,32 +0,0 @@

1−# With common maintenance tasks

2−

3−HC ?= ghc-8.4.4

4−

5−all :

6− @echo "Don't try to make all at once!"

7−

8−really-all :

9− $(MAKE) build-ghc

10− $(MAKE) build-ghc HC=ghc-8.0.2

11− $(MAKE) build-ghc HC=ghc-8.2.2

12− $(MAKE) build-ghc HC=ghc-8.6.5

13− $(MAKE) build-ghcjs

14−

15−build-ghc :

16− cabal v2-build -w $(HC) all

17−

18−build-ghcjs :

19− cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all

20−

21−packdeps :

22− packdeps */*.cabal

23−

24−doctest : doctest-servant doctest-servant-server

25− perl -i -e 'while (<ARGV>) { print unless /package-id\s+base-compat-\d+(\.\d+)*/; }' .ghc.environment.*

26−

27−doctest-servant :

28− (cd servant && doctest src)

29− (cd servant && doctest test/Servant/LinksSpec.hs)

30−

31−doctest-servant-server :

32− (cd servant-server && doctest src)

cabal.ghcjs.project+2

@@ -7,3 +7,5 @@ packages:

7-- we need to tell cabal we are using GHCJS

8compiler: ghcjs

9tests: True

10+

11+constraints: hashable <=1.3.3.0

doc/cookbook/basic-auth/basic-auth.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-basic-auth

14 main-is: BasicAuth.lhs

doc/cookbook/basic-streaming/basic-streaming.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-basic-streaming

14 main-is: Streaming.lhs

doc/cookbook/curl-mock/CurlMock.lhs−1

@@ -24,7 +24,6 @@ Language extensions and imports:

24import Control.Lens ((^.))

25import Data.Aeson

26import Data.Aeson.Text

27−import Data.Monoid ((<>))

28import Data.Proxy (Proxy (Proxy))

27import Data.Proxy (Proxy (Proxy))

29import Data.Text (Text)

28import Data.Text (Text)

30import Data.Text.Encoding (decodeUtf8)

29import Data.Text.Encoding (decodeUtf8)

doc/cookbook/curl-mock/curl-mock.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbock-curl-mock

14 main-is: CurlMock.lhs

doc/cookbook/custom-errors/CustomErrors.lhs−1

@@ -20,7 +20,6 @@ Extensions and imports:

20import Data.Aeson

21import Data.Proxy

22import Data.Text

23−import Data.Semigroup

24import GHC.Generics

23import GHC.Generics

25import Network.Wai

24import Network.Wai

26import Network.Wai.Handler.Warp

25import Network.Wai.Handler.Warp

doc/cookbook/custom-errors/custom-errors.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-custom-errors

14 main-is: CustomErrors.lhs

doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-db-postgres-pool

14 main-is: PostgresPool.lhs

doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-db-sqlite-simple

14 main-is: DBConnection.lhs

doc/cookbook/file-upload/file-upload.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-file-upload

14 main-is: FileUpload.lhs

doc/cookbook/generic/generic.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-using-custom-monad

14 main-is: Generic.lhs

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−3

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

14+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

15

16executable cookbook-hoist-server-with-context

17 main-is: HoistServerWithContext.lhs

@@ -32,8 +32,6 @@ executable cookbook-hoist-server-with-context

32 , http-types >= 0.12

33 , bytestring >= 0.10.4

34 , mtl

35− if impl(ghc < 8.2.1)

36− buildable: False

37 default-language: Haskell2010

35 default-language: Haskell2010

38 ghc-options: -Wall -pgmL markdown-unlit

36 ghc-options: -Wall -pgmL markdown-unlit

39 build-tool-depends: markdown-unlit:markdown-unlit

37 build-tool-depends: markdown-unlit:markdown-unlit

doc/cookbook/https/https.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-https

14 main-is: Https.lhs

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

11category: Servant

12build-type: Simple

13cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

14+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

15

16executable cookbook-jwt-and-basic-auth

17 main-is: JWTAndBasicAuth.lhs

doc/cookbook/open-id-connect/OpenIdConnect.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >= 1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5

11+tested-with: GHC==8.6.5

12

13executable cookbook-openidconnect

14 main-is: OpenIdConnect.lhs

doc/cookbook/pagination/pagination.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-pagination

14 main-is: Pagination.lhs

doc/cookbook/sentry/sentry.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-sentry

14 main-is: Sentry.lhs

doc/cookbook/structuring-apis/structuring-apis.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-structuring-apis

14 main-is: StructuringApis.lhs

doc/cookbook/testing/testing.cabal+1−1

@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

10category: Servant

11build-type: Simple

12cabal-version: >=1.10

13−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

13+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

14

15executable cookbook-testing

16 main-is: Testing.lhs

doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-using-custom-monad

14 main-is: UsingCustomMonad.lhs

doc/cookbook/using-free-client/using-free-client.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

8maintainer: haskell-servant-maintainers@googlegroups.com

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

11+tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1

12

13executable cookbook-using-free-client

14 main-is: UsingFreeClient.lhs

doc/cookbook/uverb/uverb.cabal−2

@@ -28,8 +28,6 @@ executable cookbook-uverb

28 , swagger2

29 , wai

30 , warp

31− if impl(ghc < 8.6.1)

32− buildable: False

33 default-language: Haskell2010

31 default-language: Haskell2010

34 ghc-options: -Wall -pgmL markdown-unlit

32 ghc-options: -Wall -pgmL markdown-unlit

35 build-tool-depends: markdown-unlit:markdown-unlit

33 build-tool-depends: markdown-unlit:markdown-unlit

doc/tutorial/Authentication.lhs−1

@@ -47,7 +47,6 @@ module Authentication where

47import Data.Aeson (ToJSON)

48import Data.ByteString (ByteString)

49import Data.Map (Map, fromList)

50−import Data.Monoid ((<>))

51import qualified Data.Map as Map

50import qualified Data.Map as Map

52import Data.Proxy (Proxy (Proxy))

51import Data.Proxy (Proxy (Proxy))

53import Data.Text (Text)

52import Data.Text (Text)

doc/tutorial/tutorial.cabal−3

@@ -13,9 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com

13build-type: Simple

14cabal-version: >=1.10

15tested-with:

16− GHC==8.0.2

17− GHC==8.2.2

18− GHC==8.4.4

19 GHC==8.6.5

16 GHC==8.6.5

20 GHC==8.8.3, GHC ==8.10.1

17 GHC==8.8.3, GHC ==8.10.1

21extra-source-files:

18extra-source-files:

nix/README.md+14−3

@@ -23,7 +23,18 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD

23```

24

25**Possible GHC versions**

26−- `ghc822Binary`

26+- `ghc865Binary`

27−- `ghc865`

28- `ghc884`

27- `ghc884`

29−- `ghc8102` - default

28+- `ghc8104` - default

29+

30+### Cabal users

31+

32+GHC version can be chosen via the nix-shell parameter

33+

34+`cabal build all`

35+

36+### Stack version

37+

38+Since the ghc version is set by the LTS version, it is preferable to use the `ghc8104` version parameter for the nix-shell.

39+

40+`stack --no-nix --system-ghc <command>`

nix/shell.nix+3−5

@@ -1,9 +1,7 @@

1−let nixos = fetchTarball {

1+let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz";

2− url = "https://releases.nixos.org/nixos/20.09/nixos-20.09.3505.12d9950bf47/nixexprs.tar.xz";

3− sha256 = "0fsl8bsdb8i536pfs4wrp0826h5l84xqlwx32sbz66jg4ykqp9lr";

4}; in

2}; in

5

3

6−{ compiler ? "ghc8102"

4+{ compiler ? "ghc8104"

7, tutorial ? false

5, tutorial ? false

8, pkgs ? import nixos { config = {}; }

6, pkgs ? import nixos { config = {}; }

9}:

7}:

@@ -16,7 +14,7 @@ let nixos = fetchTarball {

16 in

14 in

17 stdenv.mkDerivation {

15 stdenv.mkDerivation {

18 name = "servant-dev";

16 name = "servant-dev";

19− buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl ]

17+ buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl stack haskellPackages.hspec-discover ]

20 ++ (if tutorial then [docstuffs postgresql] else []);

18 ++ (if tutorial then [docstuffs postgresql] else []);

21 shellHook = ''

19 shellHook = ''

22 eval $(grep export ${ghc}/bin/ghc)

20 eval $(grep export ${ghc}/bin/ghc)

servant-client-core/servant-client-core.cabal+1−1

@@ -16,7 +16,7 @@ author: Servant Contributors

16maintainer: haskell-servant-maintainers@googlegroups.com

17copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

18build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

19+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

20 , GHCJS == 8.4

21

22extra-source-files:

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

@@ -9,8 +9,6 @@ module Servant.Client.Core.BasicAuth (

9

10import Data.ByteString.Base64

11 (encode)

12−import Data.Monoid

13− ((<>))

14import Data.Text.Encoding

12import Data.Text.Encoding

15 (decodeUtf8)

13 (decodeUtf8)

16import Servant.API.BasicAuth

14import Servant.API.BasicAuth

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

@@ -35,8 +35,6 @@ import Data.Bitraversable

35import qualified Data.ByteString as BS

36import qualified Data.ByteString.Builder as Builder

37import qualified Data.ByteString.Lazy as LBS

38−import Data.Semigroup

39− ((<>))

40import qualified Data.Sequence as Seq

38import qualified Data.Sequence as Seq

41import Data.Text

39import Data.Text

42 (Text)

40 (Text)

servant-client/servant-client.cabal+1−1

@@ -20,7 +20,7 @@ author: Servant Contributors

20maintainer: haskell-servant-maintainers@googlegroups.com

21copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

22build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

23+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24

25extra-source-files:

26 CHANGELOG.md

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

@@ -53,8 +53,6 @@ import Data.Maybe

53 (maybe, maybeToList)

54import Data.Proxy

55 (Proxy (..))

56−import Data.Semigroup

57− ((<>))

58import Data.Sequence

56import Data.Sequence

59 (fromList)

57 (fromList)

60import Data.String

58import Data.String

servant-client/test/Servant/FailSpec.hs−2

@@ -21,8 +21,6 @@ import Prelude ()

21import Prelude.Compat

22

23import Data.Monoid ()

24−import Data.Semigroup

25− ((<>))

26import qualified Network.HTTP.Types as HTTP

24import qualified Network.HTTP.Types as HTTP

27import Test.Hspec

25import Test.Hspec

28

26

servant-conduit/servant-conduit.cabal+1−1

@@ -16,7 +16,7 @@ author: Servant Contributors

16maintainer: haskell-servant-maintainers@googlegroups.com

17copyright: 2018-2019 Servant Contributors

18build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

19+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2

20

21extra-source-files:

22 CHANGELOG.md

servant-docs/servant-docs.cabal+1−1

@@ -19,7 +19,7 @@ author: Servant Contributors

19maintainer: haskell-servant-maintainers@googlegroups.com

20copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

21build-type: Simple

22−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

22+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

23

24extra-source-files:

25 CHANGELOG.md

servant-docs/src/Servant/Docs/Internal.hs−2

@@ -52,8 +52,6 @@ import Data.Ord

52 (comparing)

53import Data.Proxy

54 (Proxy (Proxy))

55−import Data.Semigroup

56− (Semigroup (..))

57import Data.String.Conversions

55import Data.String.Conversions

58 (cs)

56 (cs)

59import Data.Text

57import Data.Text

servant-foreign/servant-foreign.cabal+1−1

@@ -21,7 +21,7 @@ author: Servant Contributors

21maintainer: haskell-servant-maintainers@googlegroups.com

22copyright: 2015-2019 Servant Contributors

23build-type: Simple

24−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

25

26extra-source-files:

27 CHANGELOG.md

servant-foreign/src/Servant/Foreign/Inflections.hs−1

@@ -13,7 +13,6 @@ module Servant.Foreign.Inflections

13import Control.Lens hiding

14 (cons)

15import qualified Data.Char as C

16−import Data.Monoid

17import Data.Text hiding

16import Data.Text hiding

18 (map)

17 (map)

19import Prelude hiding

18import Prelude hiding

servant-foreign/src/Servant/Foreign/Internal.hs−2

@@ -23,8 +23,6 @@ import Control.Lens

23import Data.Data

24 (Data)

25import Data.Proxy

26−import Data.Semigroup

27− (Semigroup)

28import Data.String

26import Data.String

29import Data.Text

27import Data.Text

30import Data.Text.Encoding

28import Data.Text.Encoding

servant-foreign/test/Servant/ForeignSpec.hs−2

@@ -11,8 +11,6 @@

11

12module Servant.ForeignSpec where

13

14−import Data.Monoid

15− ((<>))

16import Data.Proxy

14import Data.Proxy

17import Servant.Foreign

15import Servant.Foreign

18import Servant.Test.ComprehensiveAPI

16import Servant.Test.ComprehensiveAPI

servant-http-streams/servant-http-streams.cabal+1−1

@@ -20,7 +20,7 @@ author: Servant Contributors

20maintainer: haskell-servant-maintainers@googlegroups.com

21copyright: 2019 Servant Contributors

22build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

23+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24

25extra-source-files:

26 CHANGELOG.md

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

@@ -49,8 +49,6 @@ import Data.Maybe

49 (maybeToList)

50import Data.Proxy

51 (Proxy (..))

52−import Data.Semigroup

53− ((<>))

54import Data.Sequence

52import Data.Sequence

55 (fromList)

53 (fromList)

56import Data.String

54import Data.String

servant-http-streams/test/Servant/ClientSpec.hs−2

@@ -44,8 +44,6 @@ import Data.Maybe

44 (isJust)

45import Data.Monoid ()

46import Data.Proxy

47−import Data.Semigroup

48− ((<>))

49import GHC.Generics

47import GHC.Generics

50 (Generic)

48 (Generic)

51import qualified Network.HTTP.Types as HTTP

49import qualified Network.HTTP.Types as HTTP

servant-machines/servant-machines.cabal+1−1

@@ -16,7 +16,7 @@ author: Servant Contributors

16maintainer: haskell-servant-maintainers@googlegroups.com

17copyright: 2018-2019 Servant Contributors

18build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

19+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2

20

21extra-source-files:

22 CHANGELOG.md

servant-pipes/servant-pipes.cabal+1−1

@@ -16,7 +16,7 @@ author: Servant Contributors

16maintainer: haskell-servant-maintainers@googlegroups.com

17copyright: 2018-2019 Servant Contributors

18build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

19+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2

20

21extra-source-files:

22 CHANGELOG.md

servant-server/servant-server.cabal+1−1

@@ -23,7 +23,7 @@ author: Servant Contributors

23maintainer: haskell-servant-maintainers@googlegroups.com

24copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

25build-type: Simple

26−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

26+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

27

28extra-source-files:

29 CHANGELOG.md

servant-server/src/Servant/Server/Internal.hs−2

@@ -46,8 +46,6 @@ import Data.Either

46 (partitionEithers)

47import Data.Maybe

48 (fromMaybe, isNothing, mapMaybe, maybeToList)

49−import Data.Semigroup

50− ((<>))

51import Data.String

49import Data.String

52 (IsString (..))

50 (IsString (..))

53import Data.String.Conversions

51import Data.String.Conversions

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

@@ -12,8 +12,6 @@ import Control.Monad.Trans

12import qualified Data.ByteString as BS

13import Data.ByteString.Base64

14 (decodeLenient)

15−import Data.Monoid

16− ((<>))

17import Data.Typeable

15import Data.Typeable

18 (Typeable)

16 (Typeable)

19import Data.Word8

17import Data.Word8

servant-server/test/Servant/Server/ErrorSpec.hs−2

@@ -12,8 +12,6 @@ import Data.Aeson

12 (encode)

13import qualified Data.ByteString.Char8 as BC

14import qualified Data.ByteString.Lazy.Char8 as BCL

15−import Data.Monoid

16− ((<>))

17import Data.Proxy

15import Data.Proxy

18import Data.String.Conversions

16import Data.String.Conversions

19 (cs)

17 (cs)

servant/servant.cabal+1−1

@@ -20,7 +20,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

20copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

21build-type: Simple

22

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

23+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24 , GHCJS == 8.4

25

26extra-source-files:

servant/src/Servant/API/Alternative.hs−2

@@ -16,8 +16,6 @@ import Data.Bifunctor

16 (Bifunctor (..))

17import Data.Bitraversable

18 (Bitraversable (..))

19−import Data.Semigroup

20− (Semigroup (..))

21import Data.Typeable

19import Data.Typeable

22 (Typeable)

20 (Typeable)

23import Prelude ()

21import Prelude ()

servant/src/Servant/API/Stream.hs−2

@@ -47,8 +47,6 @@ import qualified Data.ByteString.Lazy as LBS

47import qualified Data.ByteString.Lazy.Char8 as LBS8

48import Data.List.NonEmpty

49 (NonEmpty (..))

50−import Data.Monoid

51− ((<>))

52import Data.Proxy

50import Data.Proxy

53 (Proxy)

51 (Proxy)

54import Data.Typeable

52import Data.Typeable

servant/src/Servant/Links.hs−2

@@ -127,8 +127,6 @@ module Servant.Links (

127import Data.List

128import Data.Proxy

129 (Proxy (..))

130−import Data.Semigroup

131− ((<>))

132import Data.Singletons.Bool

130import Data.Singletons.Bool

133 (SBool (..), SBoolI (..))

131 (SBool (..), SBoolI (..))

134import qualified Data.Text as Text

132import qualified Data.Text as Text