Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow GHC 9.10 #1765

Merged
merged 3 commits into from
Jun 22, 2024
Merged

Allow GHC 9.10 #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f9af70
Allow GHC 9.10
ysangkok Jun 5, 2024
2950d5d
Add more allow-newers for postgresql-*
ysangkok Jun 5, 2024
86aaa91
Don't match on 'In the instance declaration'
ysangkok Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,29 @@ if(impl(ghc >= 9.6.1))

package servant-server
ghc-options: -fprint-redundant-promotion-ticks

allow-newer: postgresql-simple:base
allow-newer: postgresql-simple:template-haskell
allow-newer: postgresql-simple:containers
allow-newer: postgresql-libpq:base
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocked on

allow-newer: servant-swagger-ui:base
allow-newer: servant-swagger-ui-core:base
allow-newer: file-embed-lzma:base
allow-newer: file-embed-lzma:template-haskell
allow-newer: file-embed-lzma:filepath
allow-newer: lzma:base
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one was already bumped on hackage: https://hackage.haskell.org/package/lzma

allow-newer: servant-openapi3:base
allow-newer: insert-ordered-containers:base
allow-newer: insert-ordered-containers:lens
Comment on lines +84 to +85
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocked on

allow-newer: openapi3:base
allow-newer: openapi3:template-haskell
allow-newer: swagger2:base
allow-newer: swagger2:template-haskell
allow-newer: swagger2:lens
allow-newer: swagger2:containers
Comment on lines +89 to +91
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blocked on

allow-newer: pipes-safe:base
allow-newer: servant-js:base
allow-newer: servant-js:lens
allow-newer: lucid:base
allow-newer: stringsearch:containers
allow-newer: Cabal
6 changes: 3 additions & 3 deletions servant-auth/servant-auth-client/servant-auth-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ maintainer: [email protected]
copyright: (c) Julian K. Arni
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
CHANGELOG.md
Expand All @@ -31,9 +31,9 @@ library
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
base >= 4.10 && < 4.20
base >= 4.10 && < 4.21
, bytestring >= 0.10.6.0 && < 0.13
, containers >= 0.5.6.2 && < 0.7
, containers >= 0.5.6.2 && < 0.8
, servant-auth == 0.4.*
, servant >= 0.13 && < 0.21
, servant-client-core >= 0.13 && < 0.21
Expand Down
6 changes: 3 additions & 3 deletions servant-auth/servant-auth-docs/servant-auth-docs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ maintainer: [email protected]
copyright: (c) Julian K. Arni
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
build-type: Custom
extra-source-files:
CHANGELOG.md

custom-setup
setup-depends:
base < 4.20, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
base < 4.21, Cabal < 4, cabal-doctest >=1.0.6 && <1.1

source-repository head
type: git
Expand All @@ -35,7 +35,7 @@ library
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
base >= 4.10 && < 4.20
base >= 4.10 && < 4.21
, servant-docs >= 0.13 && < 0.14
, servant >= 0.13 && < 0.21
, servant-auth == 0.4.*
Expand Down
4 changes: 2 additions & 2 deletions servant-auth/servant-auth-server/servant-auth-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ maintainer: [email protected]
copyright: (c) Julian K. Arni
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
CHANGELOG.md
Expand All @@ -31,7 +31,7 @@ library
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
base >= 4.10 && < 4.20
base >= 4.10 && < 4.21
, aeson >= 1.0.0.1 && < 3
, base64-bytestring >= 1.0.0.1 && < 2
, blaze-builder >= 0.4.1.0 && < 0.5
Expand Down
4 changes: 2 additions & 2 deletions servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ maintainer: [email protected]
copyright: (c) Julian K. Arni
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
CHANGELOG.md
Expand All @@ -31,7 +31,7 @@ library
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
base >= 4.10 && < 4.20
base >= 4.10 && < 4.21
, text >= 1.2.3.0 && < 2.2
, servant-swagger >= 1.1.5 && < 2
, swagger2 >= 2.2.2 && < 3
Expand Down
6 changes: 3 additions & 3 deletions servant-auth/servant-auth/servant-auth.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ maintainer: [email protected]
copyright: (c) Julian K. Arni
license: BSD-3-Clause
license-file: LICENSE
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
CHANGELOG.md
Expand All @@ -33,8 +33,8 @@ library
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
base >= 4.10 && < 4.20
, containers >= 0.6 && < 0.7
base >= 4.10 && < 4.21
, containers >= 0.6 && < 0.8
, aeson >= 2.0 && < 3
, jose >= 0.10 && < 0.12
, lens >= 4.16.1 && < 5.4
Expand Down
8 changes: 4 additions & 4 deletions servant-client-core/servant-client-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ copyright:

build-type: Simple
tested-with:
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -102,12 +102,12 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
, base >=4.9 && <4.20
, base >=4.9 && <4.21
, bytestring >=0.10.8.1 && <0.13
, constraints >=0.2 && <0.15
, containers >=0.5.7.1 && <0.7
, containers >=0.5.7.1 && <0.8
, deepseq >=1.4.2.0 && <1.6
, template-haskell >=2.11.1.0 && <2.22
, template-haskell >=2.11.1.0 && <2.23
, text >=1.2.3.0 && <2.2

-- Servant dependencies
Expand Down
6 changes: 3 additions & 3 deletions servant-client/servant-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ copyright:

build-type: Simple
tested-with:
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -94,9 +94,9 @@ library
-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
build-depends:
, base >=4.9 && <4.20
, base >=4.9 && <4.21
, bytestring >=0.10.8.1 && <0.13
, containers >=0.5.7.1 && <0.7
, containers >=0.5.7.1 && <0.8
, deepseq >=1.4.2.0 && <1.6
, mtl ^>=2.2.2 || ^>=2.3.1
, stm >=2.4.5.1 && <2.6
Expand Down
4 changes: 2 additions & 2 deletions servant-docs/servant-docs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ author: Servant Contributors
maintainer: [email protected]
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1

extra-source-files:
CHANGELOG.md
Expand All @@ -41,7 +41,7 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.20
base >= 4.9 && < 4.21
, bytestring >= 0.10.8.1 && < 0.13
, text >= 1.2.3.0 && < 2.2

Expand Down
4 changes: 2 additions & 2 deletions servant-foreign/servant-foreign.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ author: Servant Contributors
maintainer: [email protected]
copyright: 2015-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1

extra-source-files:
CHANGELOG.md
Expand All @@ -41,7 +41,7 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.20
base >= 4.9 && < 4.21
, text >= 1.2.3.0 && < 2.2

-- Servant dependencies
Expand Down
6 changes: 3 additions & 3 deletions servant-http-streams/servant-http-streams.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ author: Servant Contributors
maintainer: [email protected]
copyright: 2019 Servant Contributors
build-type: Simple
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1

extra-source-files:
CHANGELOG.md
Expand All @@ -38,9 +38,9 @@ library
-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
build-depends:
base >= 4.9 && < 4.20
base >= 4.9 && < 4.21
, bytestring >= 0.10.8.1 && < 0.13
, containers >= 0.5.7.1 && < 0.7
, containers >= 0.5.7.1 && < 0.8
, deepseq >= 1.4.2.0 && < 1.6
, mtl ^>= 2.2.2 || ^>= 2.3.1
, text >= 1.2.3.0 && < 2.2
Expand Down
4 changes: 2 additions & 2 deletions servant-quickcheck/servant-quickcheck.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ maintainer: [email protected]
category: Web
build-type: Simple
extra-source-files: CHANGELOG.yaml
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1 || ==9.10.1

source-repository head
type: git
Expand All @@ -36,7 +36,7 @@ library
ghc-options: -Wall -Wcompat
build-depends:
aeson >=0.8 && <2.3
, base >=4.9 && <4.20
, base >=4.9 && <4.21
, base-compat-batteries >=0.10.1 && <0.15
, bytestring >=0.10 && <0.13
, case-insensitive >=1.2 && <1.3
Expand Down
8 changes: 4 additions & 4 deletions servant-server/servant-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ copyright:

build-type: Simple
tested-with:
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -116,11 +116,11 @@ library
-- Bundled with GHC: Lower bound to not force re-installs
-- text and mtl are bundled starting with GHC-8.4
build-depends:
, base >=4.9 && <4.20
, base >=4.9 && <4.21
, bytestring >=0.10.8.1 && <0.13
, constraints >=0.2 && <0.15
, containers >=0.5.7.1 && <0.7
, filepath >=1.4.1.1 && <1.5
, containers >=0.5.7.1 && <0.8
, filepath >=1.4.1.1 && <1.6
, mtl ^>=2.2.2 || ^>=2.3.1
, text >=1.2.3.0 && <2.2
, transformers >=0.5.2.0 && <0.7
Expand Down
6 changes: 3 additions & 3 deletions servant/servant.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ copyright:

build-type: Simple
tested-with:
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1

extra-source-files: CHANGELOG.md

Expand Down Expand Up @@ -127,10 +127,10 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
, base >=4.9 && <4.20
, base >=4.9 && <4.21
, bytestring >=0.10.8.1 && <0.13
, constraints >=0.2
, containers >=0.6 && <0.7
, containers >=0.6 && <0.8
, mtl ^>=2.2.2 || ^>=2.3.1
, sop-core >=0.4.0.0 && <0.6
, text >=1.2.3.0 && <2.2
Expand Down
1 change: 0 additions & 1 deletion servant/src/Servant/API/TypeLevel.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ families are not evaluated (see https://ghc.haskell.org/trac/ghc/ticket/12048).
-- ...
-- ...Only one Fragment allowed per endpoint in api...
-- ...
-- ...In the instance declaration for...
class FragmentUnique api => AtMostOneFragment api

instance AtMostOneFragment (Verb m s ct typ)
Expand Down
Loading