Skip to content

Make it build with ghc-9.12 #1810

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

Merged
merged 3 commits into from
Mar 13, 2025
Merged

Make it build with ghc-9.12 #1810

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
e3457cd
Make it build with ghc 9.12
erikd Mar 12, 2025
a7c3a97
Use more principled importing of Data.Text
erikd Mar 12, 2025
51462b1
**/*.cabal: Update tested-with list
erikd Mar 12, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Install doctest
run: |
cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.22'
cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.24'

- name: Build
run: |
Expand Down
46 changes: 26 additions & 20 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ package *

-- reorder-goals: True

-- Required as a workaround for:
-- https://github.com/haskell-cryptography/HsOpenSSL/issues/95
package HsOpenSSL
ghc-options: -optc=-Wno-discarded-qualifiers -optc=-Wno-deprecated-declarations -optc=-Wno-incompatible-pointer-types

-- Print ticks so that doctest type querying is consistent across GHC versions.
-- This block can be removed when we drop support for GHC 9.4 and below.
if(impl(ghc >= 9.6.1))
Expand All @@ -73,24 +78,25 @@ if(impl(ghc >= 9.6.1))
package lzma
flags: -pkgconfig

-- This block is for GHC 9.10.1.
allow-newer: servant-openapi3:base
allow-newer: openapi3:base
allow-newer: openapi3:template-haskell
allow-newer: servant-js:base
allow-newer: servant-js:lens
allow-newer: lucid:base

-- This block is for hashable-1.5
allow-newer: vault:hashable
allow-newer: psqueues:hashable
allow-newer: insert-ordered-containers:hashable
allow-newer: openapi3:hashable
if impl (ghc >= 9.10)
allow-newer: servant-openapi3:base
allow-newer: openapi3:base
allow-newer: openapi3:template-haskell
allow-newer: servant-js:base
allow-newer: servant-js:lens

-- http2-5.3.3 is blacklisted, force http2-5.3.2 or http2-5.3.4
constraints:
http2 ==5.3.2 || ==5.3.4

package HsOpenSSL
-- Fix compilation with GCC >= 14
ghc-options: -optc-Wno-incompatible-pointer-types
if impl (ghc >= 9.12)
allow-newer: servant-swagger-ui:base
allow-newer: servant-swagger-ui-core:base
allow-newer: insert-ordered-containers:base
allow-newer: optics-th:template-haskell
allow-newer: http-api-data:base
allow-newer: openapi3:time
allow-newer: swagger2:time
allow-newer: postgresql-simple:base
allow-newer: postgresql-simple:template-haskell
allow-newer: insert-ordered-containers:hashable
allow-newer: openapi3:hashable
allow-newer: swagger2:base
allow-newer: swagger2:template-haskell
allow-newer: pipes-safe:base
5 changes: 3 additions & 2 deletions doc/cookbook/custom-errors/CustomErrors.lhs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ Extensions and imports:

import Data.Aeson
import Data.Proxy
import Data.Text
import Data.Text (Text)
import qualified Data.Text as Text
import GHC.Generics
import Network.Wai
import Network.Wai.Handler.Warp
Expand Down Expand Up @@ -67,7 +68,7 @@ server = helloH :<|> postGreetH :<|> deleteGreetH

where helloH name Nothing = helloH name (Just False)
helloH name (Just False) = return . Greet $ "Hello, " <> name
helloH name (Just True) = return . Greet . toUpper $ "Hello, " <> name
helloH name (Just True) = return . Greet . Text.toUpper $ "Hello, " <> name

postGreetH greet = return greet

Expand Down
2 changes: 1 addition & 1 deletion doc/cookbook/named-routes/cookbook-named-routes.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ author: Servant Contributors
maintainer: [email protected]
build-type: Simple
cabal-version: >=1.10
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1

executable cookbook-named-routes
main-is: NamedRoutes.lhs
Expand Down
10 changes: 5 additions & 5 deletions doc/tutorial/tutorial.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ library
blaze-html >= 0.9.0.1 && < 0.10
, blaze-markup >= 0.8.0.0 && < 0.9
, cookie >= 0.4.3 && < 0.6
, js-jquery >= 3.3.1 && < 3.4
, js-jquery >= 3.3.1 && < 3.8
, lucid >= 2.9.11 && < 2.12
, random >= 1.1 && < 1.3
, random >= 1.1 && < 1.4
, servant-js >= 0.9 && < 0.10
, time >= 1.6.0.1 && < 1.13
, time >= 1.6.0.1 && < 1.15

-- For legacy tools, we need to specify build-depends too
build-depends: markdown-unlit >= 0.5.0 && <0.6
build-tool-depends: markdown-unlit:markdown-unlit >= 0.5.0 && <0.6
build-depends: markdown-unlit >= 0.5.0 && <0.7
build-tool-depends: markdown-unlit:markdown-unlit >= 0.5.0 && <0.7

test-suite spec
type: exitcode-stdio-1.0
Expand Down
10 changes: 5 additions & 5 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
, bytestring >= 0.11 && < 0.13
, containers >=0.6.5.1 && < 0.8
base >= 4.16.4.0 && < 4.22
, bytestring >= 0.10.6.0 && < 0.13
, containers >=0.6.5.1 && < 0.9
, servant-auth >= 0.4.2.0 && < 0.5
, servant >= 0.20.2 && < 0.21
, servant-client-core >= 0.20.2 && < 0.21
Expand Down Expand Up @@ -70,7 +70,7 @@ test-suite spec
, http-types >= 0.12.2 && < 0.13
, servant-auth-server >= 0.4.2.0 && < 0.5
, servant-server >= 0.20.2 && < 0.21
, time >= 1.5.0.1 && < 1.13
, time >= 1.5.0.1 && < 1.15
, transformers >= 0.4.2.0 && < 0.7
, wai >= 3.2.1.2 && < 3.3
, warp >= 3.2.25 && < 3.5
Expand Down
8 changes: 4 additions & 4 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1
build-type: Custom
extra-source-files:
CHANGELOG.md

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

source-repository head
Expand All @@ -36,7 +36,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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, servant-docs >= 0.13.1 && < 0.14
, servant >= 0.20.2 && < 0.21
, servant-auth >= 0.4.2.0 && < 0.5
Expand All @@ -51,7 +51,7 @@ test-suite doctests
build-depends:
base,
servant-auth-docs,
doctest >= 0.16 && < 0.23,
doctest >= 0.16 && < 0.25,
QuickCheck >= 2.11.3 && < 2.16,
template-haskell
ghc-options: -Wall -threaded
Expand Down
6 changes: 3 additions & 3 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, aeson >= 1.0.0.1 && < 3
, base64-bytestring >= 1.0.0.1 && < 2
, blaze-builder >= 0.4.1.0 && < 0.5
Expand All @@ -51,7 +51,7 @@ library
, servant-server >= 0.20.2 && < 0.21
, tagged >= 0.8.4 && < 0.9
, text >= 1.2.3.0 && < 2.2
, time >= 1.5.0.1 && < 1.13
, time >= 1.5.0.1 && < 1.15
, unordered-containers >= 0.2.9.0 && < 0.3
, wai >= 3.2.1.2 && < 3.3

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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, text >= 1.2.3.0 && < 2.2
, servant-swagger >= 1.2.1 && < 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
, containers >=0.6.5.1 && < 0.8
base >= 4.16.4.0 && < 4.22
, containers >=0.6.5.1 && < 0.9
, aeson >= 2.0 && < 3
, jose >= 0.10 && < 0.12
, lens >= 4.16.1 && < 5.4
Expand Down
9 changes: 4 additions & 5 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 @@ -19,8 +19,7 @@ copyright:
2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

build-type: Simple
tested-with:
GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1

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

-- Servant dependencies
Expand Down
2 changes: 1 addition & 1 deletion servant-client/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This library lets you automatically derive Haskell functions that let you query
{-# LANGUAGE TypeOperators #-}

import Data.Proxy
import Data.Text
import Data.Text (Text)
import Network.HTTP.Client (newManager, defaultManagerSettings)
import Servant.API
import Servant.Client
Expand Down
8 changes: 4 additions & 4 deletions servant-client/servant-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ copyright:
2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

build-type: Simple
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -93,13 +93,13 @@ 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.16.4.0 && < 4.21
, base >= 4.16.4.0 && < 4.22
, bytestring >=0.11 && <0.13
, containers >=0.6.5.1 && <0.8
, containers >=0.6.5.1 && <0.9
, deepseq >=1.4.2.0 && <1.6
, mtl ^>=2.2.2 || ^>=2.3.1
, stm >=2.4.5.1 && <2.6
, time >=1.6.0.1 && <1.13
, time >=1.6.0.1 && <1.15
, transformers >=0.5.2.0 && <0.7

-- Servant dependencies.
Expand Down
4 changes: 2 additions & 2 deletions servant-conduit/servant-conduit.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ author: Servant Contributors
maintainer: [email protected]
copyright: 2018-2019 Servant Contributors
build-type: Simple
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1

extra-source-files:
CHANGELOG.md
Expand All @@ -28,7 +28,7 @@ source-repository head
library
exposed-modules: Servant.Conduit
build-depends:
base >= 4.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, bytestring >=0.11 && <0.13
, conduit >=1.3.1 && <1.4
, mtl ^>=2.2.2 || ^>=2.3.1
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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, bytestring >= 0.11 && < 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, text >= 1.2.3.0 && < 2.2

-- Servant dependencies
Expand Down
2 changes: 1 addition & 1 deletion servant-http-streams/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This library lets you automatically derive Haskell functions that let you query
{-# LANGUAGE TypeOperators #-}

import Data.Proxy
import Data.Text
import Data.Text (Text)
import Servant.API
import Servant.HttpStreams

Expand Down
8 changes: 4 additions & 4 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 ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.4 || ==9.10.1 || ==9.12.1

extra-source-files:
CHANGELOG.md
Expand All @@ -38,13 +38,13 @@ 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.16.4.0 && < 4.21
base >= 4.16.4.0 && < 4.22
, bytestring >= 0.11 && < 0.13
, containers >= 0.6.5.1 && < 0.8
, containers >= 0.6.5.1 && < 0.9
, deepseq >= 1.4.2.0 && < 1.6
, mtl ^>= 2.2.2 || ^>= 2.3.1
, text >= 1.2.3.0 && < 2.2
, time >= 1.6.0.1 && < 1.13
, time >= 1.6.0.1 && < 1.15
, transformers >= 0.5.2.0 && < 0.7

if !impl(ghc >= 8.2)
Expand Down
Loading
Loading