Make it build with ghc-9.12 (#1810)

erikd · web-flow · commit 9cda0cfb356a · 2025-03-13T13:03:05.000+01:00
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -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: |
diff --git a/cabal.project b/cabal.project
@@ -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))
@@ -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
diff --git a/doc/cookbook/custom-errors/CustomErrors.lhs b/doc/cookbook/custom-errors/CustomErrors.lhs
@@ -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
@@ -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
 
diff --git a/doc/cookbook/named-routes/cookbook-named-routes.cabal b/doc/cookbook/named-routes/cookbook-named-routes.cabal
@@ -10,7 +10,7 @@ author:        Servant Contributors
 maintainer:    haskell-servant-maintainers@googlegroups.com
 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
diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal
@@ -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
diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal
@@ -16,7 +16,7 @@ maintainer:     jkarni@gmail.com
 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
@@ -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
@@ -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
diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal
@@ -16,14 +16,14 @@ maintainer:     jkarni@gmail.com
 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
@@ -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
@@ -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
diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal
@@ -16,7 +16,7 @@ maintainer:     jkarni@gmail.com
 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
@@ -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
@@ -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
 
diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
@@ -16,7 +16,7 @@ maintainer:     jkarni@gmail.com
 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
@@ -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
diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal
@@ -18,7 +18,7 @@ maintainer:     jkarni@gmail.com
 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
@@ -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
diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
@@ -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
@@ -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
diff --git a/servant-client/README.md b/servant-client/README.md
@@ -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
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
@@ -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
@@ -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.
diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal
@@ -16,7 +16,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 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
@@ -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
diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
@@ -19,7 +19,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 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
@@ -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
 
diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal
@@ -21,7 +21,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 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
@@ -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
diff --git a/servant-http-streams/README.md b/servant-http-streams/README.md
@@ -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
 
diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal
@@ -20,7 +20,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 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
@@ -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)
diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal
diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal
diff --git a/servant-quickcheck/servant-quickcheck.cabal b/servant-quickcheck/servant-quickcheck.cabal
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal
diff --git a/servant/servant.cabal b/servant/servant.cabal
