2563aa5 · typeable/servant

git.iko.soy/typeable/servant

Relax bounds for ghc-8.8

commit2563aa508c20de36f244aa80f1cffab4fff99eda authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Sep 2019, 10:34 (7 years ago) parent5285011

28 files changed+65−42

compare with master

unifiedsplit

cabal.project+22−4

@@ -22,9 +22,9 @@ packages:

2222 doc/cookbook/file-upload

2323 doc/cookbook/generic

2424 -- doc/cookbook/hoist-server-with-context

25− doc/cookbook/https

25+-- doc/cookbook/https

2626 -- doc/cookbook/jwt-and-basic-auth/

27− doc/cookbook/pagination

27+-- doc/cookbook/pagination

2828 -- doc/cookbook/sentry

2929 doc/cookbook/testing

3030 doc/cookbook/structuring-apis

@@ -40,6 +40,14 @@ constraints:

4040 foundation >=0.0.14,

4141 memory <0.14.12 || >0.14.12

4242

43+allow-newer:

44+ servant-multipart:http-media,

45+ servant-multipart:lens

46+

47+allow-newer:

48+ servant-js:base,

49+ servant-js:lens

50+

4351allow-newer:

4452-- servant-pagination:servant, servant-pagination:servant-server,

4553-- servant-multipart:servant, servant-multipart:servant-server,

@@ -48,11 +56,15 @@ allow-newer:

4856

4957-- servant-quickcheck

5058allow-newer:

59+ servant-quickcheck:base,

60+ servant-quickcheck:hspec,

61+ servant-quickcheck:http-client,

62+ servant-quickcheck:http-media,

63+ servant-quickcheck:QuickCheck,

5164 servant-quickcheck:servant,

5265 servant-quickcheck:servant-client,

5366 servant-quickcheck:servant-server,

54− servant-quickcheck:hspec,

55− servant-quickcheck:http-client,

67+ servant-quickcheck:time,

5668 servant-quickcheck:warp

5769

5870-- constraints: semigroups ^>=0.19

@@ -66,4 +78,10 @@ allow-newer: psqueues-0.2.7.1:hashable

6678allow-newer: sqlite-simple-0.4.16.0:semigroups

6779allow-newer: direct-sqlite-2.3.24:semigroups

6880allow-newer: io-streams-1.5.1.0:network

81+allow-newer: io-streams:primitive

6982allow-newer: openssl-streams-1.2.2.0:network

83+

84+source-repository-package

85+ type: git

86+ location: https://github.com/luqui/control-monad-omega.git

87+ tag: 76c71e8917eec275ba423959f00a34583b5c7215

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-basic-auth

1414 main-is: BasicAuth.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-basic-streaming

1414 main-is: Streaming.lhs

@@ -17,7 +17,7 @@ executable cookbook-basic-streaming

1717 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts

1818

1919 hs-source-dirs: .

20− build-depends: base >= 4.8 && <4.13

20+ build-depends: base >= 4.8 && <5

2121 , aeson

2222 , bytestring

2323 , servant

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbock-curl-mock

1414 main-is: CurlMock.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-db-postgres-pool

1414 main-is: PostgresPool.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-db-sqlite-simple

1414 main-is: DBConnection.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-file-upload

1414 main-is: FileUpload.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-using-custom-monad

1414 main-is: Generic.lhs

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

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

1111category: Servant

1212build-type: Simple

1313cabal-version: >=1.10

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

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1515

1616executable cookbook-hoist-server-with-context

1717 main-is: HoistServerWithContext.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-https

1414 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

1111category: Servant

1212build-type: Simple

1313cabal-version: >=1.10

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

14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1515

1616executable cookbook-jwt-and-basic-auth

1717 main-is: JWTAndBasicAuth.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-pagination

1414 main-is: Pagination.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-sentry

1414 main-is: Sentry.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-structuring-apis

1414 main-is: StructuringApis.lhs

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

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

1010category: Servant

1111build-type: Simple

1212cabal-version: >=1.10

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

13+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1414

1515executable cookbook-testing

1616 main-is: Testing.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-using-custom-monad

1414 main-is: UsingCustomMonad.lhs

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

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

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

99build-type: Simple

1010cabal-version: >=1.10

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

11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

1212

1313executable cookbook-using-free-client

1414 main-is: UsingFreeClient.lhs

doc/tutorial/tutorial.cabal+3−2

@@ -17,6 +17,7 @@ tested-with:

1717 GHC==8.2.2

1818 GHC==8.4.4

1919 GHC==8.6.5

20+ GHC==8.8.1

2021extra-source-files:

2122 static/index.html

2223 static/ui.js

@@ -34,7 +35,7 @@ library

3435 -- Packages `servant` depends on.

3536 -- We don't need to specify bounds here as this package is never released.

3637 build-depends:

37− base >= 4.7 && <4.13

38+ base >= 4.7 && <5

3839 , aeson

3940 , attoparsec

4041 , base-compat

@@ -69,7 +70,7 @@ library

6970 , lucid >= 2.9.11 && < 2.10

7071 , random >= 1.1 && < 1.2

7172 , servant-js >= 0.9 && < 0.10

72− , time >= 1.6.0.1 && < 1.9

73+ , time >= 1.6.0.1 && < 1.10

7374

7475 -- For legacy tools, we need to specify build-depends too

7576 build-depends: markdown-unlit >= 0.5.0 && <0.6

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

@@ -55,13 +55,13 @@ library

5555 --

5656 -- note: mtl lower bound is so low because of GHC-7.8

5757 build-depends:

58− base >= 4.9 && < 4.13

58+ base >= 4.9 && < 4.14

5959 , bytestring >= 0.10.8.1 && < 0.11

6060 , containers >= 0.5.7.1 && < 0.7

6161 , deepseq >= 1.4.2.0 && < 1.5

6262 , text >= 1.2.3.0 && < 1.3

6363 , transformers >= 0.5.2.0 && < 0.6

64− , template-haskell >= 2.11.1.0 && < 2.15

64+ , template-haskell >= 2.11.1.0 && < 2.16

6565

6666 if !impl(ghc >= 8.2)

6767 build-depends:

@@ -75,7 +75,7 @@ library

7575 -- Here can be exceptions if we really need features from the newer versions.

7676 build-depends:

7777 aeson >= 1.4.1.0 && < 1.5

78− , base-compat >= 0.10.5 && < 0.11

78+ , base-compat >= 0.10.5 && < 0.12

7979 , base64-bytestring >= 1.0.0.1 && < 1.1

8080 , exceptions >= 0.10.0 && < 0.11

8181 , free >= 5.1 && < 5.2

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

@@ -46,14 +46,14 @@ library

4646 -- Bundled with GHC: Lower bound to not force re-installs

4747 -- text and mtl are bundled starting with GHC-8.4

4848 build-depends:

49− base >= 4.9 && < 4.13

49+ base >= 4.9 && < 4.14

5050 , bytestring >= 0.10.8.1 && < 0.11

5151 , containers >= 0.5.7.1 && < 0.7

5252 , deepseq >= 1.4.2.0 && < 1.5

5353 , mtl >= 2.2.2 && < 2.3

5454 , stm >= 2.4.5.1 && < 2.6

5555 , text >= 1.2.3.0 && < 1.3

56− , time >= 1.6.0.1 && < 1.9

56+ , time >= 1.6.0.1 && < 1.10

5757 , transformers >= 0.5.2.0 && < 0.6

5858

5959 if !impl(ghc >= 8.2)

@@ -69,7 +69,7 @@ library

6969 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

7070 -- Here can be exceptions if we really need features from the newer versions.

7171 build-depends:

72− base-compat >= 0.10.5 && < 0.11

72+ base-compat >= 0.10.5 && < 0.12

7373 , http-client >= 0.5.13.1 && < 0.7

7474 , http-media >= 0.7.1.3 && < 0.9

7575 , http-types >= 0.12.2 && < 0.13

servant-conduit/servant-conduit.cabal+1

@@ -22,6 +22,7 @@ tested-with:

2222 || ==8.2.2

2323 || ==8.4.4

2424 || ==8.6.5

25+ || ==8.8.1

2526

2627extra-source-files:

2728 CHANGELOG.md

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

@@ -47,7 +47,7 @@ library

4747 --

4848 -- note: mtl lower bound is so low because of GHC-7.8

4949 build-depends:

50− base >= 4.9 && < 4.13

50+ base >= 4.9 && < 4.14

5151 , bytestring >= 0.10.8.1 && < 0.11

5252 , text >= 1.2.3.0 && < 1.3

5353

@@ -60,13 +60,13 @@ library

6060 build-depends:

6161 aeson >= 1.4.1.0 && < 1.5

6262 , aeson-pretty >= 0.8.5 && < 0.9

63− , base-compat >= 0.10.5 && < 0.11

63+ , base-compat >= 0.10.5 && < 0.12

6464 , case-insensitive >= 1.2.0.11 && < 1.3

6565 , control-monad-omega >= 0.3.1 && < 0.4

6666 , hashable >= 1.2.7.0 && < 1.4

6767 , http-media >= 0.7.1.3 && < 0.9

6868 , http-types >= 0.12.2 && < 0.13

69− , lens >= 4.17 && < 4.18

69+ , lens >= 4.17 && < 4.19

7070 , string-conversions >= 0.4.0.1 && < 0.5

7171 , unordered-containers >= 0.2.9.0 && < 0.3

7272

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

@@ -47,7 +47,7 @@ library

4747 --

4848 -- note: mtl lower bound is so low because of GHC-7.8

4949 build-depends:

50− base >= 4.9 && < 4.13

50+ base >= 4.9 && < 4.14

5151 , text >= 1.2.3.0 && < 1.3

5252

5353 -- Servant dependencies

@@ -57,8 +57,8 @@ library

5757 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

5858 -- Here can be exceptions if we really need features from the newer versions.

5959 build-depends:

60− base-compat >= 0.10.5 && < 0.11

61− , lens >= 4.17 && < 4.18

60+ base-compat >= 0.10.5 && < 0.12

61+ , lens >= 4.17 && < 4.19

6262 , http-types >= 0.12.2 && < 0.13

6363

6464 hs-source-dirs: src

servant-http-streams/servant-http-streams.cabal+4−3

@@ -26,6 +26,7 @@ tested-with:

2626 || ==8.2.2

2727 || ==8.4.4

2828 || ==8.6.5

29+ || ==8.8.1

2930

3031extra-source-files:

3132 CHANGELOG.md

@@ -43,13 +44,13 @@ library

4344 -- Bundled with GHC: Lower bound to not force re-installs

4445 -- text and mtl are bundled starting with GHC-8.4

4546 build-depends:

46− base >= 4.9 && < 4.13

47+ base >= 4.9 && < 4.14

4748 , bytestring >= 0.10.8.1 && < 0.11

4849 , containers >= 0.5.7.1 && < 0.7

4950 , deepseq >= 1.4.2.0 && < 1.5

5051 , mtl >= 2.2.2 && < 2.3

5152 , text >= 1.2.3.0 && < 1.3

52− , time >= 1.6.0.1 && < 1.9

53+ , time >= 1.6.0.1 && < 1.10

5354 , transformers >= 0.5.2.0 && < 0.6

5455

5556 if !impl(ghc >= 8.2)

@@ -65,7 +66,7 @@ library

6566 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

6667 -- Here can be exceptions if we really need features from the newer versions.

6768 build-depends:

68− base-compat >= 0.10.5 && < 0.11

69+ base-compat >= 0.10.5 && < 0.12

6970 , case-insensitive

7071 , http-streams >= 0.8.6.1 && < 0.9

7172 , http-media >= 0.7.1.3 && < 0.9

servant-machines/servant-machines.cabal+1

@@ -22,6 +22,7 @@ tested-with:

2222 || ==8.2.2

2323 || ==8.4.4

2424 || ==8.6.5

25+ || ==8.8.1

2526

2627extra-source-files:

2728 CHANGELOG.md

servant-pipes/servant-pipes.cabal+1

@@ -22,6 +22,7 @@ tested-with:

2222 || ==8.2.2

2323 || ==8.4.4

2424 || ==8.6.5

25+ || ==8.8.1

2526

2627extra-source-files:

2728 CHANGELOG.md

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

@@ -69,7 +69,7 @@ library

6969 -- Bundled with GHC: Lower bound to not force re-installs

7070 -- text and mtl are bundled starting with GHC-8.4

7171 build-depends:

72− base >= 4.9 && < 4.13

72+ base >= 4.9 && < 4.14

7373 , bytestring >= 0.10.8.1 && < 0.11

7474 , containers >= 0.5.7.1 && < 0.7

7575 , mtl >= 2.2.2 && < 2.3

@@ -86,7 +86,7 @@ library

8686 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

8787 -- Here can be exceptions if we really need features from the newer versions.

8888 build-depends:

89− base-compat >= 0.10.5 && < 0.11

89+ base-compat >= 0.10.5 && < 0.12

9090 , base64-bytestring >= 1.0.0.1 && < 1.1

9191 , exceptions >= 0.10.0 && < 0.11

9292 , http-media >= 0.7.1.3 && < 0.9

servant/servant.cabal+2−2

@@ -89,7 +89,7 @@ library

8989 --

9090 -- note: mtl lower bound is so low because of GHC-7.8

9191 build-depends:

92− base >= 4.9 && < 4.13

92+ base >= 4.9 && < 4.14

9393 , bytestring >= 0.10.8.1 && < 0.11

9494 , mtl >= 2.2.2 && < 2.3

9595 , transformers >= 0.5.2.0 && < 0.6

@@ -105,7 +105,7 @@ library

105105 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

106106 -- Here can be exceptions if we really need features from the newer versions.

107107 build-depends:

108− base-compat >= 0.10.5 && < 0.11

108+ base-compat >= 0.10.5 && < 0.12

109109 , aeson >= 1.4.1.0 && < 1.5

110110 , attoparsec >= 0.13.2.2 && < 0.14

111111 , bifunctors >= 5.5.3 && < 5.6