From b1a9876dc994bb7bccd5a4c44a0dba0f9eb84dda Mon Sep 17 00:00:00 2001 From: akhesaCaro Date: Sun, 12 Sep 2021 10:49:43 +0200 Subject: [PATCH 1/7] unsupporting GHC < 8.6.5 in the nix-shell --- nix/README.md | 17 ++++++++++++++--- nix/shell.nix | 6 ++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/nix/README.md b/nix/README.md index 4dfc519d..7514a6ad 100644 --- a/nix/README.md +++ b/nix/README.md @@ -23,7 +23,18 @@ $ nix-shell nix/shell.nix --argstr compiler ghcHEAD ``` **Possible GHC versions** -- `ghc822Binary` -- `ghc865` +- `ghc865Binary` - `ghc884` -- `ghc8102` - default +- `ghc8104` - default + +### Cabal users + +GHC version can be chosen via the nix-shell parameter + +`cabal build all` + +### Stack version + +Since the ghc version is set by the LTS version, it is preferable to use the `ghc8104` version parameter for the nix-shell. + +`stack --no-nix --system-ghc ` \ No newline at end of file diff --git a/nix/shell.nix b/nix/shell.nix index 5fa96923..f5a574f5 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,9 +1,7 @@ -let nixos = fetchTarball { - url = "https://releases.nixos.org/nixos/20.09/nixos-20.09.3505.12d9950bf47/nixexprs.tar.xz"; - sha256 = "0fsl8bsdb8i536pfs4wrp0826h5l84xqlwx32sbz66jg4ykqp9lr"; +let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.05.tar.gz"; }; in -{ compiler ? "ghc8102" +{ compiler ? "ghc8104" , tutorial ? false , pkgs ? import nixos { config = {}; } }: From af7d281ef0056cb36b4fffaea5e0b890b5df62c7 Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 13:09:51 +0200 Subject: [PATCH 2/7] add missing dependencies into shell.nix --- nix/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/shell.nix b/nix/shell.nix index f5a574f5..ebe07722 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -14,7 +14,7 @@ let nixos = fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/refs/ in stdenv.mkDerivation { name = "servant-dev"; - buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl ] + buildInputs = [ ghc zlib python3 wget cabal-install postgresql openssl stack haskellPackages.hspec-discover ] ++ (if tutorial then [docstuffs postgresql] else []); shellHook = '' eval $(grep export ${ghc}/bin/ghc) From 1fa18781803d76f65964663f928355b5c578630b Mon Sep 17 00:00:00 2001 From: akhesaCaro Date: Sun, 12 Sep 2021 10:49:58 +0200 Subject: [PATCH 3/7] unsupporting GHC < 8.6.5 in the CI --- .github/workflows/master.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d5477cec..c6a0ed85 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,9 +15,6 @@ jobs: os: [ubuntu-latest] cabal: ["3.4"] ghc: - - "8.0.2" - - "8.2.2" - - "8.4.4" - "8.6.5" - "8.8.4" - "8.10.4" From 6e5dffbb91fb2f1a2a60d441d6087e26e3fc4e26 Mon Sep 17 00:00:00 2001 From: akhesaCaro Date: Sun, 12 Sep 2021 10:50:53 +0200 Subject: [PATCH 4/7] unsupporting GHC < 8.6.5, removing unecessary imports --- doc/cookbook/curl-mock/CurlMock.lhs | 1 - doc/cookbook/custom-errors/CustomErrors.lhs | 1 - doc/cookbook/uverb/uverb.cabal | 2 -- doc/tutorial/Authentication.lhs | 1 - servant-client-core/src/Servant/Client/Core/BasicAuth.hs | 2 -- servant-client-core/src/Servant/Client/Core/Request.hs | 2 -- servant-client/src/Servant/Client/Internal/HttpClient.hs | 2 -- servant-client/test/Servant/FailSpec.hs | 2 -- servant-docs/src/Servant/Docs/Internal.hs | 2 -- servant-foreign/src/Servant/Foreign/Inflections.hs | 1 - servant-foreign/src/Servant/Foreign/Internal.hs | 2 -- servant-foreign/test/Servant/ForeignSpec.hs | 2 -- servant-http-streams/src/Servant/HttpStreams/Internal.hs | 2 -- servant-http-streams/test/Servant/ClientSpec.hs | 2 -- servant-server/src/Servant/Server/Internal.hs | 2 -- servant-server/src/Servant/Server/Internal/BasicAuth.hs | 2 -- servant-server/test/Servant/Server/ErrorSpec.hs | 2 -- servant/src/Servant/API/Alternative.hs | 2 -- servant/src/Servant/API/Stream.hs | 2 -- servant/src/Servant/Links.hs | 2 -- 20 files changed, 36 deletions(-) diff --git a/doc/cookbook/curl-mock/CurlMock.lhs b/doc/cookbook/curl-mock/CurlMock.lhs index 126349bf..5ed3b1a2 100644 --- a/doc/cookbook/curl-mock/CurlMock.lhs +++ b/doc/cookbook/curl-mock/CurlMock.lhs @@ -24,7 +24,6 @@ Language extensions and imports: import Control.Lens ((^.)) import Data.Aeson import Data.Aeson.Text -import Data.Monoid ((<>)) import Data.Proxy (Proxy (Proxy)) import Data.Text (Text) import Data.Text.Encoding (decodeUtf8) diff --git a/doc/cookbook/custom-errors/CustomErrors.lhs b/doc/cookbook/custom-errors/CustomErrors.lhs index a8330a5e..4e8b773c 100644 --- a/doc/cookbook/custom-errors/CustomErrors.lhs +++ b/doc/cookbook/custom-errors/CustomErrors.lhs @@ -20,7 +20,6 @@ Extensions and imports: import Data.Aeson import Data.Proxy import Data.Text -import Data.Semigroup import GHC.Generics import Network.Wai import Network.Wai.Handler.Warp diff --git a/doc/cookbook/uverb/uverb.cabal b/doc/cookbook/uverb/uverb.cabal index 6c984070..a835a8dc 100644 --- a/doc/cookbook/uverb/uverb.cabal +++ b/doc/cookbook/uverb/uverb.cabal @@ -28,8 +28,6 @@ executable cookbook-uverb , swagger2 , wai , warp - if impl(ghc < 8.6.1) - buildable: False default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/tutorial/Authentication.lhs b/doc/tutorial/Authentication.lhs index aa339d54..69bb8f10 100644 --- a/doc/tutorial/Authentication.lhs +++ b/doc/tutorial/Authentication.lhs @@ -47,7 +47,6 @@ module Authentication where import Data.Aeson (ToJSON) import Data.ByteString (ByteString) import Data.Map (Map, fromList) -import Data.Monoid ((<>)) import qualified Data.Map as Map import Data.Proxy (Proxy (Proxy)) import Data.Text (Text) diff --git a/servant-client-core/src/Servant/Client/Core/BasicAuth.hs b/servant-client-core/src/Servant/Client/Core/BasicAuth.hs index 64862688..3856b6ce 100644 --- a/servant-client-core/src/Servant/Client/Core/BasicAuth.hs +++ b/servant-client-core/src/Servant/Client/Core/BasicAuth.hs @@ -9,8 +9,6 @@ module Servant.Client.Core.BasicAuth ( import Data.ByteString.Base64 (encode) -import Data.Monoid - ((<>)) import Data.Text.Encoding (decodeUtf8) import Servant.API.BasicAuth diff --git a/servant-client-core/src/Servant/Client/Core/Request.hs b/servant-client-core/src/Servant/Client/Core/Request.hs index 0276d46f..9196c795 100644 --- a/servant-client-core/src/Servant/Client/Core/Request.hs +++ b/servant-client-core/src/Servant/Client/Core/Request.hs @@ -35,8 +35,6 @@ import Data.Bitraversable import qualified Data.ByteString as BS import qualified Data.ByteString.Builder as Builder import qualified Data.ByteString.Lazy as LBS -import Data.Semigroup - ((<>)) import qualified Data.Sequence as Seq import Data.Text (Text) diff --git a/servant-client/src/Servant/Client/Internal/HttpClient.hs b/servant-client/src/Servant/Client/Internal/HttpClient.hs index 29c209f8..61d51bc4 100644 --- a/servant-client/src/Servant/Client/Internal/HttpClient.hs +++ b/servant-client/src/Servant/Client/Internal/HttpClient.hs @@ -53,8 +53,6 @@ import Data.Maybe (maybe, maybeToList) import Data.Proxy (Proxy (..)) -import Data.Semigroup - ((<>)) import Data.Sequence (fromList) import Data.String diff --git a/servant-client/test/Servant/FailSpec.hs b/servant-client/test/Servant/FailSpec.hs index baec72b6..0abf3e73 100644 --- a/servant-client/test/Servant/FailSpec.hs +++ b/servant-client/test/Servant/FailSpec.hs @@ -21,8 +21,6 @@ import Prelude () import Prelude.Compat import Data.Monoid () -import Data.Semigroup - ((<>)) import qualified Network.HTTP.Types as HTTP import Test.Hspec diff --git a/servant-docs/src/Servant/Docs/Internal.hs b/servant-docs/src/Servant/Docs/Internal.hs index 31c2c141..b989f52b 100644 --- a/servant-docs/src/Servant/Docs/Internal.hs +++ b/servant-docs/src/Servant/Docs/Internal.hs @@ -52,8 +52,6 @@ import Data.Ord (comparing) import Data.Proxy (Proxy (Proxy)) -import Data.Semigroup - (Semigroup (..)) import Data.String.Conversions (cs) import Data.Text diff --git a/servant-foreign/src/Servant/Foreign/Inflections.hs b/servant-foreign/src/Servant/Foreign/Inflections.hs index 42f89927..dcacb4cf 100644 --- a/servant-foreign/src/Servant/Foreign/Inflections.hs +++ b/servant-foreign/src/Servant/Foreign/Inflections.hs @@ -13,7 +13,6 @@ module Servant.Foreign.Inflections import Control.Lens hiding (cons) import qualified Data.Char as C -import Data.Monoid import Data.Text hiding (map) import Prelude hiding diff --git a/servant-foreign/src/Servant/Foreign/Internal.hs b/servant-foreign/src/Servant/Foreign/Internal.hs index 356f9681..ee36315c 100644 --- a/servant-foreign/src/Servant/Foreign/Internal.hs +++ b/servant-foreign/src/Servant/Foreign/Internal.hs @@ -23,8 +23,6 @@ import Control.Lens import Data.Data (Data) import Data.Proxy -import Data.Semigroup - (Semigroup) import Data.String import Data.Text import Data.Text.Encoding diff --git a/servant-foreign/test/Servant/ForeignSpec.hs b/servant-foreign/test/Servant/ForeignSpec.hs index 3baaf7b6..12e52401 100644 --- a/servant-foreign/test/Servant/ForeignSpec.hs +++ b/servant-foreign/test/Servant/ForeignSpec.hs @@ -11,8 +11,6 @@ module Servant.ForeignSpec where -import Data.Monoid - ((<>)) import Data.Proxy import Servant.Foreign import Servant.Test.ComprehensiveAPI diff --git a/servant-http-streams/src/Servant/HttpStreams/Internal.hs b/servant-http-streams/src/Servant/HttpStreams/Internal.hs index 4d2bae2e..aef500b9 100644 --- a/servant-http-streams/src/Servant/HttpStreams/Internal.hs +++ b/servant-http-streams/src/Servant/HttpStreams/Internal.hs @@ -49,8 +49,6 @@ import Data.Maybe (maybeToList) import Data.Proxy (Proxy (..)) -import Data.Semigroup - ((<>)) import Data.Sequence (fromList) import Data.String diff --git a/servant-http-streams/test/Servant/ClientSpec.hs b/servant-http-streams/test/Servant/ClientSpec.hs index 41e7fbe4..b0c752df 100644 --- a/servant-http-streams/test/Servant/ClientSpec.hs +++ b/servant-http-streams/test/Servant/ClientSpec.hs @@ -44,8 +44,6 @@ import Data.Maybe (isJust) import Data.Monoid () import Data.Proxy -import Data.Semigroup - ((<>)) import GHC.Generics (Generic) import qualified Network.HTTP.Types as HTTP diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs index 9579367f..e15102e0 100644 --- a/servant-server/src/Servant/Server/Internal.hs +++ b/servant-server/src/Servant/Server/Internal.hs @@ -46,8 +46,6 @@ import Data.Either (partitionEithers) import Data.Maybe (fromMaybe, isNothing, mapMaybe, maybeToList) -import Data.Semigroup - ((<>)) import Data.String (IsString (..)) import Data.String.Conversions diff --git a/servant-server/src/Servant/Server/Internal/BasicAuth.hs b/servant-server/src/Servant/Server/Internal/BasicAuth.hs index b92e4b02..4b30d897 100644 --- a/servant-server/src/Servant/Server/Internal/BasicAuth.hs +++ b/servant-server/src/Servant/Server/Internal/BasicAuth.hs @@ -12,8 +12,6 @@ import Control.Monad.Trans import qualified Data.ByteString as BS import Data.ByteString.Base64 (decodeLenient) -import Data.Monoid - ((<>)) import Data.Typeable (Typeable) import Data.Word8 diff --git a/servant-server/test/Servant/Server/ErrorSpec.hs b/servant-server/test/Servant/Server/ErrorSpec.hs index 72251b21..e9d880b0 100644 --- a/servant-server/test/Servant/Server/ErrorSpec.hs +++ b/servant-server/test/Servant/Server/ErrorSpec.hs @@ -12,8 +12,6 @@ import Data.Aeson (encode) import qualified Data.ByteString.Char8 as BC import qualified Data.ByteString.Lazy.Char8 as BCL -import Data.Monoid - ((<>)) import Data.Proxy import Data.String.Conversions (cs) diff --git a/servant/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs index 60152ac1..e87dd394 100644 --- a/servant/src/Servant/API/Alternative.hs +++ b/servant/src/Servant/API/Alternative.hs @@ -16,8 +16,6 @@ import Data.Bifunctor (Bifunctor (..)) import Data.Bitraversable (Bitraversable (..)) -import Data.Semigroup - (Semigroup (..)) import Data.Typeable (Typeable) import Prelude () diff --git a/servant/src/Servant/API/Stream.hs b/servant/src/Servant/API/Stream.hs index 64164f5a..6f6a59cf 100644 --- a/servant/src/Servant/API/Stream.hs +++ b/servant/src/Servant/API/Stream.hs @@ -47,8 +47,6 @@ import qualified Data.ByteString.Lazy as LBS import qualified Data.ByteString.Lazy.Char8 as LBS8 import Data.List.NonEmpty (NonEmpty (..)) -import Data.Monoid - ((<>)) import Data.Proxy (Proxy) import Data.Typeable diff --git a/servant/src/Servant/Links.hs b/servant/src/Servant/Links.hs index bfd47206..50a7ee57 100644 --- a/servant/src/Servant/Links.hs +++ b/servant/src/Servant/Links.hs @@ -127,8 +127,6 @@ module Servant.Links ( import Data.List import Data.Proxy (Proxy (..)) -import Data.Semigroup - ((<>)) import Data.Singletons.Bool (SBool (..), SBoolI (..)) import qualified Data.Text as Text From e56f0092d7f4279be34540a90ad653518a8f3e78 Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 12:56:23 +0200 Subject: [PATCH 5/7] remove tested-with (GHC < 8.6.5) from cabal --- doc/cookbook/basic-auth/basic-auth.cabal | 2 +- doc/cookbook/basic-streaming/basic-streaming.cabal | 2 +- doc/cookbook/curl-mock/curl-mock.cabal | 2 +- doc/cookbook/custom-errors/custom-errors.cabal | 2 +- doc/cookbook/db-postgres-pool/db-postgres-pool.cabal | 2 +- doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal | 2 +- doc/cookbook/file-upload/file-upload.cabal | 2 +- doc/cookbook/generic/generic.cabal | 2 +- .../hoist-server-with-context/hoist-server-with-context.cabal | 4 +--- doc/cookbook/https/https.cabal | 2 +- doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal | 2 +- doc/cookbook/open-id-connect/OpenIdConnect.cabal | 2 +- doc/cookbook/pagination/pagination.cabal | 2 +- doc/cookbook/sentry/sentry.cabal | 2 +- doc/cookbook/structuring-apis/structuring-apis.cabal | 2 +- doc/cookbook/testing/testing.cabal | 2 +- doc/cookbook/using-custom-monad/using-custom-monad.cabal | 2 +- doc/cookbook/using-free-client/using-free-client.cabal | 2 +- doc/tutorial/tutorial.cabal | 3 --- servant-client-core/servant-client-core.cabal | 2 +- servant-client/servant-client.cabal | 2 +- servant-conduit/servant-conduit.cabal | 2 +- servant-docs/servant-docs.cabal | 2 +- servant-foreign/servant-foreign.cabal | 2 +- servant-http-streams/servant-http-streams.cabal | 2 +- servant-machines/servant-machines.cabal | 2 +- servant-pipes/servant-pipes.cabal | 2 +- servant-server/servant-server.cabal | 2 +- servant/servant.cabal | 2 +- 29 files changed, 28 insertions(+), 33 deletions(-) diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal index d3f41059..50354167 100644 --- a/doc/cookbook/basic-auth/basic-auth.cabal +++ b/doc/cookbook/basic-auth/basic-auth.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-basic-auth main-is: BasicAuth.lhs diff --git a/doc/cookbook/basic-streaming/basic-streaming.cabal b/doc/cookbook/basic-streaming/basic-streaming.cabal index bfbf5331..0d872c0a 100644 --- a/doc/cookbook/basic-streaming/basic-streaming.cabal +++ b/doc/cookbook/basic-streaming/basic-streaming.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-basic-streaming main-is: Streaming.lhs diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal index c0322413..fb78f58c 100644 --- a/doc/cookbook/curl-mock/curl-mock.cabal +++ b/doc/cookbook/curl-mock/curl-mock.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbock-curl-mock main-is: CurlMock.lhs diff --git a/doc/cookbook/custom-errors/custom-errors.cabal b/doc/cookbook/custom-errors/custom-errors.cabal index d43b5102..f9f87df8 100644 --- a/doc/cookbook/custom-errors/custom-errors.cabal +++ b/doc/cookbook/custom-errors/custom-errors.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-custom-errors main-is: CustomErrors.lhs diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal index 8d0a6eb0..b7c86034 100644 --- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal +++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-db-postgres-pool main-is: PostgresPool.lhs diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal index 108b85c8..12fe44cc 100644 --- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal +++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-db-sqlite-simple main-is: DBConnection.lhs diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal index d589912c..9ae526d6 100644 --- a/doc/cookbook/file-upload/file-upload.cabal +++ b/doc/cookbook/file-upload/file-upload.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-file-upload main-is: FileUpload.lhs diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal index 5081a981..d58d1e9c 100644 --- a/doc/cookbook/generic/generic.cabal +++ b/doc/cookbook/generic/generic.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-using-custom-monad main-is: Generic.lhs 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 7db1ab7e..708f9f52 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 @@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-hoist-server-with-context main-is: HoistServerWithContext.lhs @@ -32,8 +32,6 @@ executable cookbook-hoist-server-with-context , http-types >= 0.12 , bytestring >= 0.10.4 , mtl - if impl(ghc < 8.2.1) - buildable: False default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index e2ca9c15..6541ffc3 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-https main-is: Https.lhs 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 dcbb95ba..daa605c2 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 @@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-jwt-and-basic-auth main-is: JWTAndBasicAuth.lhs diff --git a/doc/cookbook/open-id-connect/OpenIdConnect.cabal b/doc/cookbook/open-id-connect/OpenIdConnect.cabal index eae9fb7e..a7c3d35a 100644 --- a/doc/cookbook/open-id-connect/OpenIdConnect.cabal +++ b/doc/cookbook/open-id-connect/OpenIdConnect.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >= 1.10 -tested-with: GHC==8.4.4, GHC==8.6.5 +tested-with: GHC==8.6.5 executable cookbook-openidconnect main-is: OpenIdConnect.lhs diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal index 2e021dc0..d184a968 100644 --- a/doc/cookbook/pagination/pagination.cabal +++ b/doc/cookbook/pagination/pagination.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-pagination main-is: Pagination.lhs diff --git a/doc/cookbook/sentry/sentry.cabal b/doc/cookbook/sentry/sentry.cabal index 41750a45..455682ac 100644 --- a/doc/cookbook/sentry/sentry.cabal +++ b/doc/cookbook/sentry/sentry.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-sentry main-is: Sentry.lhs diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal index 431950f1..1ef71a56 100644 --- a/doc/cookbook/structuring-apis/structuring-apis.cabal +++ b/doc/cookbook/structuring-apis/structuring-apis.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-structuring-apis main-is: StructuringApis.lhs diff --git a/doc/cookbook/testing/testing.cabal b/doc/cookbook/testing/testing.cabal index 6d9c59a7..818b5e21 100644 --- a/doc/cookbook/testing/testing.cabal +++ b/doc/cookbook/testing/testing.cabal @@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-testing main-is: Testing.lhs diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal index 022a1ad8..5b00e17d 100644 --- a/doc/cookbook/using-custom-monad/using-custom-monad.cabal +++ b/doc/cookbook/using-custom-monad/using-custom-monad.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-using-custom-monad main-is: UsingCustomMonad.lhs diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal index 51ac1fc0..8fcd4bb1 100644 --- a/doc/cookbook/using-free-client/using-free-client.cabal +++ b/doc/cookbook/using-free-client/using-free-client.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 +tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.1 executable cookbook-using-free-client main-is: UsingFreeClient.lhs diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index a97770cb..bf484d40 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -13,9 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 tested-with: - GHC==8.0.2 - GHC==8.2.2 - GHC==8.4.4 GHC==8.6.5 GHC==8.8.3, GHC ==8.10.1 extra-source-files: diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 0a72c8f2..b1008f36 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -16,7 +16,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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 , GHCJS == 8.4 extra-source-files: diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 498bafbe..8f69a4ad 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -20,7 +20,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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index 53e50bc9..2958e47d 100644 --- 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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 extra-source-files: CHANGELOG.md diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index a26adde9..f0d7949d 100644 --- 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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 56911a9f..b9c01048 100644 --- 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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 0db7132d..b7798f1c 100644 --- 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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index 2ce1f564..43bc7b46 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 extra-source-files: CHANGELOG.md diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index 49499870..599268f1 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 extra-source-files: CHANGELOG.md diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 685eff72..0b3736e8 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -23,7 +23,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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 extra-source-files: CHANGELOG.md diff --git a/servant/servant.cabal b/servant/servant.cabal index da5e6627..8dd79c75 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -20,7 +20,7 @@ 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 ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 +tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 , GHCJS == 8.4 extra-source-files: From e5f1604a9d8c0e415193fc8ba168ff2e73907a60 Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 12:57:16 +0200 Subject: [PATCH 6/7] removing Makefile deprecated with its GHC version --- Makefile | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 2caf4c05..00000000 --- a/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# With common maintenance tasks - -HC ?= ghc-8.4.4 - -all : - @echo "Don't try to make all at once!" - -really-all : - $(MAKE) build-ghc - $(MAKE) build-ghc HC=ghc-8.0.2 - $(MAKE) build-ghc HC=ghc-8.2.2 - $(MAKE) build-ghc HC=ghc-8.6.5 - $(MAKE) build-ghcjs - -build-ghc : - cabal v2-build -w $(HC) all - -build-ghcjs : - cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all - -packdeps : - packdeps */*.cabal - -doctest : doctest-servant doctest-servant-server - perl -i -e 'while () { print unless /package-id\s+base-compat-\d+(\.\d+)*/; }' .ghc.environment.* - -doctest-servant : - (cd servant && doctest src) - (cd servant && doctest test/Servant/LinksSpec.hs) - -doctest-servant-server : - (cd servant-server && doctest src) From a4aacc94751430321950e2f259cb3c0352e0c7e7 Mon Sep 17 00:00:00 2001 From: akhesacaro Date: Sat, 2 Oct 2021 13:20:05 +0200 Subject: [PATCH 7/7] A new version of hashable isn't compitable with our ghcjs. A max bound version is needed in the Cabal file --- cabal.ghcjs.project | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cabal.ghcjs.project b/cabal.ghcjs.project index 11ceb957..72902332 100644 --- a/cabal.ghcjs.project +++ b/cabal.ghcjs.project @@ -7,3 +7,5 @@ packages: -- we need to tell cabal we are using GHCJS compiler: ghcjs tests: True + +constraints: hashable <=1.3.3.0