From 39898676a8c30966b68cbefa18e9acdcd94d06eb Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 13 Mar 2022 19:58:24 -0600 Subject: [PATCH] Enable all packages on GHC 9.2 --- doc/cookbook/curl-mock/curl-mock.cabal | 2 -- .../hoist-server-with-context.cabal | 2 -- doc/cookbook/https/https.cabal | 2 -- .../jwt-and-basic-auth/jwt-and-basic-auth.cabal | 2 -- .../servant-auth-client/servant-auth-client.cabal | 10 +++------- .../servant-auth-docs/servant-auth-docs.cabal | 8 +------- .../servant-auth-server/servant-auth-server.cabal | 14 ++++---------- servant-auth/servant-auth/servant-auth.cabal | 4 +--- 8 files changed, 9 insertions(+), 35 deletions(-) diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal index b794fe81..fc2ea1fb 100644 --- a/doc/cookbook/curl-mock/curl-mock.cabal +++ b/doc/cookbook/curl-mock/curl-mock.cabal @@ -11,8 +11,6 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbock-curl-mock - if impl(ghc >= 9.2) - buildable: False main-is: CurlMock.lhs build-depends: base == 4.* , aeson diff --git a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal index 7f378f04..2172fc6c 100644 --- a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal +++ b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal @@ -14,8 +14,6 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-hoist-server-with-context - if impl(ghc >= 9.2) - buildable: False main-is: HoistServerWithContext.lhs build-depends: base == 4.* , base-compat diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index bebaea86..473c8a6a 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -11,8 +11,6 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-https - if impl(ghc >= 9.2) - buildable: False main-is: Https.lhs build-depends: base == 4.* , servant diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal index 819b649e..297a1306 100644 --- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal +++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal @@ -14,8 +14,6 @@ build-type: Simple tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-jwt-and-basic-auth - if impl(ghc >= 9.2) - buildable: False main-is: JWTAndBasicAuth.lhs build-depends: base == 4.* , text >= 1.2 diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal index fe74ef01..56a7cd94 100644 --- a/servant-auth/servant-auth-client/servant-auth-client.cabal +++ b/servant-auth/servant-auth-client/servant-auth-client.cabal @@ -26,15 +26,13 @@ source-repository head location: https://github.com/haskell-servant/servant library - if impl(ghc >= 9.2) - buildable: False hs-source-dirs: src 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.16 - , bytestring >= 0.10.6.0 && < 0.11 + base >= 4.10 && < 4.17 + , bytestring >= 0.10.6.0 && < 0.12 , containers >= 0.5.6.2 && < 0.7 , servant-auth == 0.4.* , servant >= 0.13 && < 0.20 @@ -46,8 +44,6 @@ library default-language: Haskell2010 test-suite spec - if impl(ghc >= 9.2) - buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: @@ -69,7 +65,7 @@ test-suite spec hspec >= 2.5.5 && < 2.9 , QuickCheck >= 2.11.3 && < 2.15 , aeson >= 1.3.1.1 && < 3 - , bytestring >= 0.10.6.0 && < 0.11 + , bytestring >= 0.10.6.0 && < 0.12 , http-client >= 0.5.13.1 && < 0.8 , http-types >= 0.12.2 && < 0.13 , servant-auth-server >= 0.4.2.0 && < 0.5 diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal index f87623e1..0c404b5d 100644 --- a/servant-auth/servant-auth-docs/servant-auth-docs.cabal +++ b/servant-auth/servant-auth-docs/servant-auth-docs.cabal @@ -30,14 +30,12 @@ source-repository head location: https://github.com/haskell-servant/servant library - if impl(ghc >= 9.2) - buildable: False hs-source-dirs: src 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.16 + base >= 4.10 && < 4.17 , servant-docs >= 0.11.2 && < 0.13 , servant >= 0.13 && < 0.20 , servant-auth == 0.4.* @@ -47,8 +45,6 @@ library default-language: Haskell2010 test-suite doctests - if impl(ghc >= 9.2) - buildable: False type: exitcode-stdio-1.0 main-is: doctests.hs build-depends: @@ -62,8 +58,6 @@ test-suite doctests default-language: Haskell2010 test-suite spec - if impl(ghc >= 9.2) - buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal index dd4aab86..aad2687e 100644 --- a/servant-auth/servant-auth-server/servant-auth-server.cabal +++ b/servant-auth/servant-auth-server/servant-auth-server.cabal @@ -26,18 +26,16 @@ source-repository head location: https://github.com/haskell-servant/servant library - if impl(ghc >= 9.2) - buildable: False hs-source-dirs: src 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.16 + base >= 4.10 && < 4.17 , aeson >= 1.0.0.1 && < 3 , base64-bytestring >= 1.0.0.1 && < 2 , blaze-builder >= 0.4.1.0 && < 0.5 - , bytestring >= 0.10.6.0 && < 0.11 + , bytestring >= 0.10.6.0 && < 0.12 , case-insensitive >= 1.2.0.11 && < 1.3 , cookie >= 0.4.4 && < 0.5 , data-default-class >= 0.1.2.0 && < 0.2 @@ -45,7 +43,7 @@ library , http-types >= 0.12.2 && < 0.13 , jose >= 0.7.0.0 && < 0.10 , lens >= 4.16.1 && < 5.2 - , memory >= 0.14.16 && < 0.17 + , memory >= 0.14.16 && < 0.18 , monad-time >= 0.3.1.0 && < 0.4 , mtl >= 2.2.2 && < 2.3 , servant >= 0.13 && < 0.20 @@ -53,7 +51,7 @@ library , servant-server >= 0.13 && < 0.20 , tagged >= 0.8.4 && < 0.9 , text >= 1.2.3.0 && < 2.1 - , time >= 1.5.0.1 && < 1.10 + , time >= 1.5.0.1 && < 1.12 , unordered-containers >= 0.2.9.0 && < 0.3 , wai >= 3.2.1.2 && < 3.3 @@ -80,8 +78,6 @@ library default-language: Haskell2010 test-suite readme - if impl(ghc >= 9.2) - buildable: False type: exitcode-stdio-1.0 main-is: README.lhs default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators @@ -100,8 +96,6 @@ test-suite readme buildable: False test-suite spec - if impl(ghc >= 9.2) - buildable: False type: exitcode-stdio-1.0 main-is: Spec.hs hs-source-dirs: diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal index 5c948b87..8ae96972 100644 --- a/servant-auth/servant-auth/servant-auth.cabal +++ b/servant-auth/servant-auth/servant-auth.cabal @@ -28,14 +28,12 @@ source-repository head location: https://github.com/haskell-servant/servant library - if impl(ghc >= 9.2) - buildable: False hs-source-dirs: src 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.16 + base >= 4.10 && < 4.17 , containers >= 0.6 && < 0.7 , aeson >= 1.3.1.1 && < 3 , jose >= 0.7.0.0 && < 0.10