Allow GHC 9.2 for compatible packages

This commit is contained in:
Janus Troelsen 2022-02-24 21:24:59 -06:00
parent de923fc887
commit 17e3eb1041
19 changed files with 52 additions and 22 deletions

View file

@ -19,6 +19,7 @@ jobs:
- "8.8.4" - "8.8.4"
- "8.10.7" - "8.10.7"
- "9.0.2" - "9.0.2"
- "9.2.2"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View file

@ -55,3 +55,6 @@ optimization: False
-- https://github.com/chordify/haskell-servant-pagination/pull/12 -- https://github.com/chordify/haskell-servant-pagination/pull/12
allow-newer: servant-pagination-2.2.2:servant allow-newer: servant-pagination-2.2.2:servant
allow-newer: servant-pagination-2.2.2:servant-server allow-newer: servant-pagination-2.2.2:servant-server
allow-newer: servant-multipart:bytestring
allow-newer: servant-multipart-api:bytestring

View file

@ -11,6 +11,8 @@ build-type: Simple
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
executable cookbock-curl-mock executable cookbock-curl-mock
if impl(ghc >= 9.2)
buildable: False
main-is: CurlMock.lhs main-is: CurlMock.lhs
build-depends: base == 4.* build-depends: base == 4.*
, aeson , aeson

View file

@ -14,6 +14,8 @@ build-type: Simple
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
executable cookbook-hoist-server-with-context executable cookbook-hoist-server-with-context
if impl(ghc >= 9.2)
buildable: False
main-is: HoistServerWithContext.lhs main-is: HoistServerWithContext.lhs
build-depends: base == 4.* build-depends: base == 4.*
, base-compat , base-compat

View file

@ -11,6 +11,8 @@ build-type: Simple
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
executable cookbook-https executable cookbook-https
if impl(ghc >= 9.2)
buildable: False
main-is: Https.lhs main-is: Https.lhs
build-depends: base == 4.* build-depends: base == 4.*
, servant , servant

View file

@ -14,6 +14,8 @@ build-type: Simple
tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7
executable cookbook-jwt-and-basic-auth executable cookbook-jwt-and-basic-auth
if impl(ghc >= 9.2)
buildable: False
main-is: JWTAndBasicAuth.lhs main-is: JWTAndBasicAuth.lhs
build-depends: base == 4.* build-depends: base == 4.*
, text >= 1.2 , text >= 1.2

View file

@ -64,7 +64,7 @@ library
, blaze-markup >= 0.8.0.0 && < 0.9 , blaze-markup >= 0.8.0.0 && < 0.9
, cookie >= 0.4.3 && < 0.5 , cookie >= 0.4.3 && < 0.5
, js-jquery >= 3.3.1 && < 3.4 , js-jquery >= 3.3.1 && < 3.4
, lucid >= 2.9.11 && < 2.10 , lucid >= 2.9.11 && < 2.12
, random >= 1.1 && < 1.3 , random >= 1.1 && < 1.3
, servant-js >= 0.9 && < 0.10 , servant-js >= 0.9 && < 0.10
, time >= 1.6.0.1 && < 1.13 , time >= 1.6.0.1 && < 1.13

View file

@ -26,6 +26,8 @@ source-repository head
location: https://github.com/haskell-servant/servant location: https://github.com/haskell-servant/servant
library library
if impl(ghc >= 9.2)
buildable: False
hs-source-dirs: hs-source-dirs:
src src
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators 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
default-language: Haskell2010 default-language: Haskell2010
test-suite spec test-suite spec
if impl(ghc >= 9.2)
buildable: False
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Spec.hs main-is: Spec.hs
hs-source-dirs: hs-source-dirs:

View file

@ -30,6 +30,8 @@ source-repository head
location: https://github.com/haskell-servant/servant location: https://github.com/haskell-servant/servant
library library
if impl(ghc >= 9.2)
buildable: False
hs-source-dirs: hs-source-dirs:
src src
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators 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
default-language: Haskell2010 default-language: Haskell2010
test-suite doctests test-suite doctests
if impl(ghc >= 9.2)
buildable: False
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: doctests.hs main-is: doctests.hs
build-depends: build-depends:
@ -58,6 +62,8 @@ test-suite doctests
default-language: Haskell2010 default-language: Haskell2010
test-suite spec test-suite spec
if impl(ghc >= 9.2)
buildable: False
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Spec.hs main-is: Spec.hs
hs-source-dirs: hs-source-dirs:

View file

@ -26,6 +26,8 @@ source-repository head
location: https://github.com/haskell-servant/servant location: https://github.com/haskell-servant/servant
library library
if impl(ghc >= 9.2)
buildable: False
hs-source-dirs: hs-source-dirs:
src src
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
@ -78,6 +80,8 @@ library
default-language: Haskell2010 default-language: Haskell2010
test-suite readme test-suite readme
if impl(ghc >= 9.2)
buildable: False
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: README.lhs main-is: README.lhs
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators 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
buildable: False buildable: False
test-suite spec test-suite spec
if impl(ghc >= 9.2)
buildable: False
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Spec.hs main-is: Spec.hs
hs-source-dirs: hs-source-dirs:

View file

@ -28,6 +28,8 @@ source-repository head
location: https://github.com/haskell-servant/servant location: https://github.com/haskell-servant/servant
library library
if impl(ghc >= 9.2)
buildable: False
hs-source-dirs: hs-source-dirs:
src src
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

View file

@ -50,14 +50,14 @@ library
-- --
-- note: mtl lower bound is so low because of GHC-7.8 -- note: mtl lower bound is so low because of GHC-7.8
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, constraints >= 0.2 && < 0.14 , constraints >= 0.2 && < 0.14
, containers >= 0.5.7.1 && < 0.7 , containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5 , deepseq >= 1.4.2.0 && < 1.5
, text >= 1.2.3.0 && < 2.1 , text >= 1.2.3.0 && < 2.1
, transformers >= 0.5.2.0 && < 0.6 , transformers >= 0.5.2.0 && < 0.6
, template-haskell >= 2.11.1.0 && < 2.18 , template-haskell >= 2.11.1.0 && < 2.19
if !impl(ghc >= 8.2) if !impl(ghc >= 8.2)
build-depends: build-depends:
@ -71,7 +71,7 @@ library
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
aeson >= 1.4.1.0 && < 3 aeson >= 1.4.1.0 && < 3
, base-compat >= 0.10.5 && < 0.12 , base-compat >= 0.10.5 && < 0.13
, base64-bytestring >= 1.0.0.1 && < 1.3 , base64-bytestring >= 1.0.0.1 && < 1.3
, exceptions >= 0.10.0 && < 0.11 , exceptions >= 0.10.0 && < 0.11
, free >= 5.1 && < 5.2 , free >= 5.1 && < 5.2

View file

@ -41,14 +41,14 @@ library
-- Bundled with GHC: Lower bound to not force re-installs -- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4 -- text and mtl are bundled starting with GHC-8.4
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, containers >= 0.5.7.1 && < 0.7 , containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5 , deepseq >= 1.4.2.0 && < 1.5
, mtl >= 2.2.2 && < 2.3 , mtl >= 2.2.2 && < 2.3
, stm >= 2.4.5.1 && < 2.6 , stm >= 2.4.5.1 && < 2.6
, text >= 1.2.3.0 && < 2.1 , text >= 1.2.3.0 && < 2.1
, time >= 1.6.0.1 && < 1.10 , time >= 1.6.0.1 && < 1.12
, transformers >= 0.5.2.0 && < 0.6 , transformers >= 0.5.2.0 && < 0.6
if !impl(ghc >= 8.2) if !impl(ghc >= 8.2)
@ -64,7 +64,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.10.5 && < 0.12 base-compat >= 0.10.5 && < 0.13
, http-client >= 0.5.13.1 && < 0.8 , http-client >= 0.5.13.1 && < 0.8
, http-media >= 0.7.1.3 && < 0.9 , http-media >= 0.7.1.3 && < 0.9
, http-types >= 0.12.2 && < 0.13 , http-types >= 0.12.2 && < 0.13

View file

@ -41,7 +41,7 @@ library
-- --
-- note: mtl lower bound is so low because of GHC-7.8 -- note: mtl lower bound is so low because of GHC-7.8
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, text >= 1.2.3.0 && < 2.1 , text >= 1.2.3.0 && < 2.1
@ -54,7 +54,7 @@ library
build-depends: build-depends:
aeson >= 1.4.1.0 && < 3 aeson >= 1.4.1.0 && < 3
, aeson-pretty >= 0.8.5 && < 0.9 , aeson-pretty >= 0.8.5 && < 0.9
, base-compat >= 0.10.5 && < 0.12 , base-compat >= 0.10.5 && < 0.13
, case-insensitive >= 1.2.0.11 && < 1.3 , case-insensitive >= 1.2.0.11 && < 1.3
, hashable >= 1.2.7.0 && < 1.5 , hashable >= 1.2.7.0 && < 1.5
, http-media >= 0.7.1.3 && < 0.9 , http-media >= 0.7.1.3 && < 0.9

View file

@ -41,7 +41,7 @@ library
-- --
-- note: mtl lower bound is so low because of GHC-7.8 -- note: mtl lower bound is so low because of GHC-7.8
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, text >= 1.2.3.0 && < 2.1 , text >= 1.2.3.0 && < 2.1
-- Servant dependencies -- Servant dependencies
@ -51,7 +51,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.10.5 && < 0.12 base-compat >= 0.10.5 && < 0.13
, lens >= 4.17 && < 5.2 , lens >= 4.17 && < 5.2
, http-types >= 0.12.2 && < 0.13 , http-types >= 0.12.2 && < 0.13

View file

@ -38,13 +38,13 @@ library
-- Bundled with GHC: Lower bound to not force re-installs -- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4 -- text and mtl are bundled starting with GHC-8.4
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, containers >= 0.5.7.1 && < 0.7 , containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5 , deepseq >= 1.4.2.0 && < 1.5
, mtl >= 2.2.2 && < 2.3 , mtl >= 2.2.2 && < 2.3
, text >= 1.2.3.0 && < 2.1 , text >= 1.2.3.0 && < 2.1
, time >= 1.6.0.1 && < 1.10 , time >= 1.6.0.1 && < 1.12
, transformers >= 0.5.2.0 && < 0.6 , transformers >= 0.5.2.0 && < 0.6
if !impl(ghc >= 8.2) if !impl(ghc >= 8.2)
@ -60,13 +60,13 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.10.5 && < 0.12 base-compat >= 0.10.5 && < 0.13
, case-insensitive , case-insensitive
, http-streams >= 0.8.6.1 && < 0.9 , http-streams >= 0.8.6.1 && < 0.9
, http-media >= 0.7.1.3 && < 0.9 , http-media >= 0.7.1.3 && < 0.9
, io-streams >= 1.5.0.1 && < 1.6 , io-streams >= 1.5.0.1 && < 1.6
, http-types >= 0.12.2 && < 0.13 , http-types >= 0.12.2 && < 0.13
, http-common >= 0.8.2.0 && < 0.8.3 , http-common >= 0.8.2.0 && < 0.9
, exceptions >= 0.10.0 && < 0.11 , exceptions >= 0.10.0 && < 0.11
, kan-extensions >= 5.2 && < 5.3 , kan-extensions >= 5.2 && < 5.3
, monad-control >= 1.0.2.3 && < 1.1 , monad-control >= 1.0.2.3 && < 1.1

View file

@ -60,7 +60,7 @@ library
-- Bundled with GHC: Lower bound to not force re-installs -- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4 -- text and mtl are bundled starting with GHC-8.4
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, constraints >= 0.2 && < 0.14 , constraints >= 0.2 && < 0.14
, containers >= 0.5.7.1 && < 0.7 , containers >= 0.5.7.1 && < 0.7
@ -78,7 +78,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.10.5 && < 0.12 base-compat >= 0.10.5 && < 0.13
, base64-bytestring >= 1.0.0.1 && < 1.3 , base64-bytestring >= 1.0.0.1 && < 1.3
, exceptions >= 0.10.0 && < 0.11 , exceptions >= 0.10.0 && < 0.11
, http-media >= 0.7.1.3 && < 0.9 , http-media >= 0.7.1.3 && < 0.9

View file

@ -50,7 +50,7 @@ source-repository head
custom-setup custom-setup
setup-depends: setup-depends:
base >=4.9 && <5, base >=4.9 && <5,
Cabal >= 1.24 && < 3.5, Cabal >= 1.24,
cabal-doctest >=1.0.6 && <1.1 cabal-doctest >=1.0.6 && <1.1
library library
@ -72,8 +72,8 @@ library
build-depends: aeson >=1.4.2.0 && <3 build-depends: aeson >=1.4.2.0 && <3
, aeson-pretty >=0.8.7 && <0.9 , aeson-pretty >=0.8.7 && <0.9
, base >=4.9.1.0 && <5 , base >=4.9.1.0 && <5
, base-compat >=0.10.5 && <0.12 , base-compat >=0.10.5 && <0.13
, bytestring >=0.10.8.1 && <0.11 , bytestring >=0.10.8.1 && <0.12
, http-media >=0.7.1.3 && <0.9 , http-media >=0.7.1.3 && <0.9
, insert-ordered-containers >=0.2.1.0 && <0.3 , insert-ordered-containers >=0.2.1.0 && <0.3
, lens >=4.17 && <6 , lens >=4.17 && <6

View file

@ -80,7 +80,7 @@ library
-- --
-- note: mtl lower bound is so low because of GHC-7.8 -- note: mtl lower bound is so low because of GHC-7.8
build-depends: build-depends:
base >= 4.9 && < 4.16 base >= 4.9 && < 4.17
, bytestring >= 0.10.8.1 && < 0.12 , bytestring >= 0.10.8.1 && < 0.12
, constraints >= 0.2 , constraints >= 0.2
, mtl >= 2.2.2 && < 2.3 , mtl >= 2.2.2 && < 2.3
@ -98,7 +98,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions. -- Here can be exceptions if we really need features from the newer versions.
build-depends: build-depends:
base-compat >= 0.10.5 && < 0.12 base-compat >= 0.10.5 && < 0.13
, aeson >= 1.4.1.0 && < 3 , aeson >= 1.4.1.0 && < 3
, attoparsec >= 0.13.2.2 && < 0.15 , attoparsec >= 0.13.2.2 && < 0.15
, bifunctors >= 5.5.3 && < 5.6 , bifunctors >= 5.5.3 && < 5.6