17e3eb1 · typeable/servant

git.iko.soy/typeable/servant

Allow GHC 9.2 for compatible packages

commit17e3eb10418585a393035236449a12c4019f705a authorJanus Troelsen <janus@flipstone.com> dateThu 24 Feb 2022, 21:24 (5 years ago) parentde923fc

19 files changed+52−22

compare with master

unifiedsplit

.github/workflows/master.yml+1 cabal.project+3 doc/cookbook/curl-mock/curl-mock.cabal+2 doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+2 doc/cookbook/https/https.cabal+2 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+2 doc/tutorial/tutorial.cabal+1−1 servant-auth/servant-auth-client/servant-auth-client.cabal+4 servant-auth/servant-auth-docs/servant-auth-docs.cabal+6 servant-auth/servant-auth-server/servant-auth-server.cabal+6 servant-auth/servant-auth/servant-auth.cabal+2 servant-client-core/servant-client-core.cabal+3−3 servant-client/servant-client.cabal+3−3 servant-docs/servant-docs.cabal+2−2 servant-foreign/servant-foreign.cabal+2−2 servant-http-streams/servant-http-streams.cabal+4−4 servant-server/servant-server.cabal+2−2 servant-swagger/servant-swagger.cabal+3−3 servant/servant.cabal+2−2

.github/workflows/master.yml+1

@@ -19,6 +19,7 @@ jobs:

1919 - "8.8.4"

2020 - "8.10.7"

2121 - "9.0.2"

22+ - "9.2.2"

2223

2324 steps:

2425 - uses: actions/checkout@v2

cabal.project+3

@@ -55,3 +55,6 @@ optimization: False

5555-- https://github.com/chordify/haskell-servant-pagination/pull/12

5656allow-newer: servant-pagination-2.2.2:servant

5757allow-newer: servant-pagination-2.2.2:servant-server

58+

59+allow-newer: servant-multipart:bytestring

60+allow-newer: servant-multipart-api:bytestring

doc/cookbook/curl-mock/curl-mock.cabal+2

@@ -11,6 +11,8 @@ build-type: Simple

1111tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

1212

1313executable cookbock-curl-mock

14+ if impl(ghc >= 9.2)

15+ buildable: False

1416 main-is: CurlMock.lhs

1517 build-depends: base == 4.*

1618 , aeson

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+2

@@ -14,6 +14,8 @@ build-type: Simple

1414tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

1515

1616executable cookbook-hoist-server-with-context

17+ if impl(ghc >= 9.2)

18+ buildable: False

1719 main-is: HoistServerWithContext.lhs

1820 build-depends: base == 4.*

1921 , base-compat

doc/cookbook/https/https.cabal+2

@@ -11,6 +11,8 @@ build-type: Simple

1111tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

1212

1313executable cookbook-https

14+ if impl(ghc >= 9.2)

15+ buildable: False

1416 main-is: Https.lhs

1517 build-depends: base == 4.*

1618 , servant

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+2

@@ -14,6 +14,8 @@ build-type: Simple

1414tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

1515

1616executable cookbook-jwt-and-basic-auth

17+ if impl(ghc >= 9.2)

18+ buildable: False

1719 main-is: JWTAndBasicAuth.lhs

1820 build-depends: base == 4.*

1921 , text >= 1.2

doc/tutorial/tutorial.cabal+1−1

@@ -64,7 +64,7 @@ library

6464 , blaze-markup >= 0.8.0.0 && < 0.9

6565 , cookie >= 0.4.3 && < 0.5

6666 , js-jquery >= 3.3.1 && < 3.4

67− , lucid >= 2.9.11 && < 2.10

67+ , lucid >= 2.9.11 && < 2.12

6868 , random >= 1.1 && < 1.3

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

7070 , time >= 1.6.0.1 && < 1.13

servant-auth/servant-auth-client/servant-auth-client.cabal+4

@@ -26,6 +26,8 @@ source-repository head

2626 location: https://github.com/haskell-servant/servant

2727

2828library

29+ if impl(ghc >= 9.2)

30+ buildable: False

2931 hs-source-dirs:

3032 src

3133 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -44,6 +46,8 @@ library

4446 default-language: Haskell2010

4547

4648test-suite spec

49+ if impl(ghc >= 9.2)

50+ buildable: False

4751 type: exitcode-stdio-1.0

4852 main-is: Spec.hs

4953 hs-source-dirs:

servant-auth/servant-auth-docs/servant-auth-docs.cabal+6

@@ -30,6 +30,8 @@ source-repository head

3030 location: https://github.com/haskell-servant/servant

3131

3232library

33+ if impl(ghc >= 9.2)

34+ buildable: False

3335 hs-source-dirs:

3436 src

3537 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -45,6 +47,8 @@ library

4547 default-language: Haskell2010

4648

4749test-suite doctests

50+ if impl(ghc >= 9.2)

51+ buildable: False

4852 type: exitcode-stdio-1.0

4953 main-is: doctests.hs

5054 build-depends:

@@ -58,6 +62,8 @@ test-suite doctests

5862 default-language: Haskell2010

5963

6064test-suite spec

65+ if impl(ghc >= 9.2)

66+ buildable: False

6167 type: exitcode-stdio-1.0

6268 main-is: Spec.hs

6369 hs-source-dirs:

servant-auth/servant-auth-server/servant-auth-server.cabal+6

@@ -26,6 +26,8 @@ source-repository head

2626 location: https://github.com/haskell-servant/servant

2727

2828library

29+ if impl(ghc >= 9.2)

30+ buildable: False

2931 hs-source-dirs:

3032 src

@@ -78,6 +80,8 @@ library

7880 default-language: Haskell2010

7981

8082test-suite readme

83+ if impl(ghc >= 9.2)

84+ buildable: False

8185 type: exitcode-stdio-1.0

8286 main-is: README.lhs

8387 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -96,6 +100,8 @@ test-suite readme

96100 buildable: False

97101

98102test-suite spec

103+ if impl(ghc >= 9.2)

104+ buildable: False

99105 type: exitcode-stdio-1.0

100106 main-is: Spec.hs

101107 hs-source-dirs:

servant-auth/servant-auth/servant-auth.cabal+2

@@ -28,6 +28,8 @@ source-repository head

2828 location: https://github.com/haskell-servant/servant

2929

3030library

31+ if impl(ghc >= 9.2)

32+ buildable: False

3133 hs-source-dirs:

3234 src

3335 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

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

@@ -50,14 +50,14 @@ library

5050 --

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

5252 build-depends:

53− base >= 4.9 && < 4.16

53+ base >= 4.9 && < 4.17

5454 , bytestring >= 0.10.8.1 && < 0.12

5555 , constraints >= 0.2 && < 0.14

5656 , containers >= 0.5.7.1 && < 0.7

5757 , deepseq >= 1.4.2.0 && < 1.5

5858 , text >= 1.2.3.0 && < 2.1

5959 , transformers >= 0.5.2.0 && < 0.6

60− , template-haskell >= 2.11.1.0 && < 2.18

60+ , template-haskell >= 2.11.1.0 && < 2.19

6161

6262 if !impl(ghc >= 8.2)

6363 build-depends:

@@ -71,7 +71,7 @@ library

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

7272 build-depends:

7373 aeson >= 1.4.1.0 && < 3

74− , base-compat >= 0.10.5 && < 0.12

74+ , base-compat >= 0.10.5 && < 0.13

7575 , base64-bytestring >= 1.0.0.1 && < 1.3

7676 , exceptions >= 0.10.0 && < 0.11

7777 , free >= 5.1 && < 5.2

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

@@ -41,14 +41,14 @@ library

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

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

4343 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

4545 , bytestring >= 0.10.8.1 && < 0.12

4646 , containers >= 0.5.7.1 && < 0.7

4747 , deepseq >= 1.4.2.0 && < 1.5

4848 , mtl >= 2.2.2 && < 2.3

4949 , stm >= 2.4.5.1 && < 2.6

5050 , text >= 1.2.3.0 && < 2.1

51− , time >= 1.6.0.1 && < 1.10

51+ , time >= 1.6.0.1 && < 1.12

5252 , transformers >= 0.5.2.0 && < 0.6

5353

5454 if !impl(ghc >= 8.2)

@@ -64,7 +64,7 @@ library

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

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

6666 build-depends:

67− base-compat >= 0.10.5 && < 0.12

67+ base-compat >= 0.10.5 && < 0.13

6868 , http-client >= 0.5.13.1 && < 0.8

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

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

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

@@ -41,7 +41,7 @@ library

4141 --

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

4343 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

4545 , bytestring >= 0.10.8.1 && < 0.12

4646 , text >= 1.2.3.0 && < 2.1

4747

@@ -54,7 +54,7 @@ library

5454 build-depends:

5555 aeson >= 1.4.1.0 && < 3

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

57− , base-compat >= 0.10.5 && < 0.12

57+ , base-compat >= 0.10.5 && < 0.13

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

5959 , hashable >= 1.2.7.0 && < 1.5

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

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

@@ -41,7 +41,7 @@ library

4141 --

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

4343 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

4545 , text >= 1.2.3.0 && < 2.1

4646

4747 -- Servant dependencies

@@ -51,7 +51,7 @@ library

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

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

5353 build-depends:

54− base-compat >= 0.10.5 && < 0.12

54+ base-compat >= 0.10.5 && < 0.13

5555 , lens >= 4.17 && < 5.2

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

5757

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

@@ -38,13 +38,13 @@ library

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

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

4040 build-depends:

41− base >= 4.9 && < 4.16

41+ base >= 4.9 && < 4.17

4242 , bytestring >= 0.10.8.1 && < 0.12

4343 , containers >= 0.5.7.1 && < 0.7

4444 , deepseq >= 1.4.2.0 && < 1.5

4545 , mtl >= 2.2.2 && < 2.3

4646 , text >= 1.2.3.0 && < 2.1

47− , time >= 1.6.0.1 && < 1.10

47+ , time >= 1.6.0.1 && < 1.12

4848 , transformers >= 0.5.2.0 && < 0.6

4949

5050 if !impl(ghc >= 8.2)

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

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

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

6262 build-depends:

63− base-compat >= 0.10.5 && < 0.12

63+ base-compat >= 0.10.5 && < 0.13

6464 , case-insensitive

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

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

6767 , io-streams >= 1.5.0.1 && < 1.6

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

69− , http-common >= 0.8.2.0 && < 0.8.3

69+ , http-common >= 0.8.2.0 && < 0.9

7070 , exceptions >= 0.10.0 && < 0.11

7171 , kan-extensions >= 5.2 && < 5.3

7272 , monad-control >= 1.0.2.3 && < 1.1

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

@@ -60,7 +60,7 @@ library

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

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

6262 build-depends:

63− base >= 4.9 && < 4.16

63+ base >= 4.9 && < 4.17

6464 , bytestring >= 0.10.8.1 && < 0.12

6565 , constraints >= 0.2 && < 0.14

6666 , containers >= 0.5.7.1 && < 0.7

@@ -78,7 +78,7 @@ library

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

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

8080 build-depends:

81− base-compat >= 0.10.5 && < 0.12

81+ base-compat >= 0.10.5 && < 0.13

8282 , base64-bytestring >= 1.0.0.1 && < 1.3

8383 , exceptions >= 0.10.0 && < 0.11

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

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

@@ -50,7 +50,7 @@ source-repository head

5050custom-setup

5151 setup-depends:

5252 base >=4.9 && <5,

53− Cabal >= 1.24 && < 3.5,

53+ Cabal >= 1.24,

5454 cabal-doctest >=1.0.6 && <1.1

5555

5656library

@@ -72,8 +72,8 @@ library

7272 build-depends: aeson >=1.4.2.0 && <3

7373 , aeson-pretty >=0.8.7 && <0.9

7474 , base >=4.9.1.0 && <5

75− , base-compat >=0.10.5 && <0.12

76− , bytestring >=0.10.8.1 && <0.11

75+ , base-compat >=0.10.5 && <0.13

76+ , bytestring >=0.10.8.1 && <0.12

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

7878 , insert-ordered-containers >=0.2.1.0 && <0.3

7979 , lens >=4.17 && <6

servant/servant.cabal+2−2

@@ -80,7 +80,7 @@ library

8080 --

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

8282 build-depends:

83− base >= 4.9 && < 4.16

83+ base >= 4.9 && < 4.17

8484 , bytestring >= 0.10.8.1 && < 0.12

8585 , constraints >= 0.2

8686 , mtl >= 2.2.2 && < 2.3

@@ -98,7 +98,7 @@ library

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

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

100100 build-depends:

101− base-compat >= 0.10.5 && < 0.12

101+ base-compat >= 0.10.5 && < 0.13

102102 , aeson >= 1.4.1.0 && < 3

103103 , attoparsec >= 0.13.2.2 && < 0.15

104104 , bifunctors >= 5.5.3 && < 5.6