From 73c87bc2bc0685649f2337b06ab4fdc66c4ce1dd Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Jan 2022 22:06:23 +0100 Subject: [PATCH] bumped cabal-version field (#1498) * bumped cabal-version field Cabal supports two types of licenses, native and SPDX, which can be seen here hackage.haskell.org/package/Cabal-3.6.2.0/docs/Distribution-Types-PackageDescription.html#v:licenseRaw Several packages use BSD-3-Clause as a license, in conjonction with cabal-version: >=1.10 which cabal parses as Right (UnknownLicense "BSD-3"). If I change teh cabal-version to cabal-version: 2.2 , cabal correctly identifdies the license License (ELicense (ELicenseId BSD_3_Clause)). * changed license from cabal to spdx format aka BSD3 -> BSD-3-Clause: next cabal may deprecate the old format --- 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-mysql-basics/mysql-basics.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 | 2 +- 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/cookbook/uverb/uverb.cabal | 2 +- doc/tutorial/tutorial.cabal | 2 +- servant-auth/servant-auth-client/servant-auth-client.cabal | 2 +- servant-auth/servant-auth-docs/servant-auth-docs.cabal | 2 +- servant-auth/servant-auth-server/servant-auth-server.cabal | 2 +- servant-auth/servant-auth-swagger/servant-auth-swagger.cabal | 2 +- servant-auth/servant-auth/servant-auth.cabal | 2 +- servant-client-core/servant-client-core.cabal | 2 +- servant-client-ghcjs/servant-client-ghcjs.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 | 4 ++-- servant-server/servant-server.cabal | 2 +- servant-swagger/example/example.cabal | 4 ++-- servant-swagger/servant-swagger.cabal | 4 ++-- servant/servant.cabal | 2 +- servant/src/Servant/Types/SourceT.hs | 2 +- 40 files changed, 43 insertions(+), 43 deletions(-) diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal index f46693c0..a8ee560f 100644 --- a/doc/cookbook/basic-auth/basic-auth.cabal +++ b/doc/cookbook/basic-auth/basic-auth.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-basic-auth version: 0.1 synopsis: Basic Authentication cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-basic-auth diff --git a/doc/cookbook/basic-streaming/basic-streaming.cabal b/doc/cookbook/basic-streaming/basic-streaming.cabal index d90ccf24..0092f750 100644 --- a/doc/cookbook/basic-streaming/basic-streaming.cabal +++ b/doc/cookbook/basic-streaming/basic-streaming.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-basic-streaming version: 2.1 synopsis: Streaming in servant without streaming libs @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-basic-streaming diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal index 741a72f2..fc2ea1fb 100644 --- a/doc/cookbook/curl-mock/curl-mock.cabal +++ b/doc/cookbook/curl-mock/curl-mock.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-curl-mock version: 0.1 synopsis: Generate curl mock requests cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbock-curl-mock diff --git a/doc/cookbook/custom-errors/custom-errors.cabal b/doc/cookbook/custom-errors/custom-errors.cabal index 6677bf59..f17ee7ed 100644 --- a/doc/cookbook/custom-errors/custom-errors.cabal +++ b/doc/cookbook/custom-errors/custom-errors.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-custom-errors version: 0.1 synopsis: Return custom error messages from combinators @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-custom-errors diff --git a/doc/cookbook/db-mysql-basics/mysql-basics.cabal b/doc/cookbook/db-mysql-basics/mysql-basics.cabal index 62097b15..7d977753 100644 --- a/doc/cookbook/db-mysql-basics/mysql-basics.cabal +++ b/doc/cookbook/db-mysql-basics/mysql-basics.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: mysql-basics version: 0.1.0.0 synopsis: Simple MySQL API cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 executable run hs-source-dirs: . diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal index d500ed40..344e1e69 100644 --- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal +++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-db-postgres-pool version: 0.1 synopsis: Simple PostgreSQL connection pool cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-db-postgres-pool diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal index e4e13def..f6351594 100644 --- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal +++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-db-sqlite-simple version: 0.1 synopsis: Simple SQLite DB cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-db-sqlite-simple diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal index 3d67687c..40764107 100644 --- a/doc/cookbook/file-upload/file-upload.cabal +++ b/doc/cookbook/file-upload/file-upload.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-file-upload version: 0.1 synopsis: File upload cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-file-upload diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal index 4b089c4e..725f70c9 100644 --- a/doc/cookbook/generic/generic.cabal +++ b/doc/cookbook/generic/generic.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-generic version: 0.1 synopsis: Using custom monad to pass a state between handlers @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-using-custom-monad 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 ea734e89..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 @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-hoist-server-with-context version: 0.0.1 synopsis: JWT and basic access authentication with a Custom Monad cookbook example @@ -10,7 +11,6 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-hoist-server-with-context diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index 045b4888..473c8a6a 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-https version: 0.1 synopsis: HTTPS cookbook example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-https 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 53d4c650..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 @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-jwt-and-basic-auth version: 0.0.1 synopsis: JWT and basic access authentication cookbook example @@ -10,7 +11,6 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-jwt-and-basic-auth diff --git a/doc/cookbook/open-id-connect/OpenIdConnect.cabal b/doc/cookbook/open-id-connect/OpenIdConnect.cabal index c156f8d7..3ce54333 100644 --- a/doc/cookbook/open-id-connect/OpenIdConnect.cabal +++ b/doc/cookbook/open-id-connect/OpenIdConnect.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: open-id-connect version: 0.1 synopsis: OpenId Connect with Servant example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >= 1.10 tested-with: GHC==8.6.5 executable cookbook-openidconnect diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal index 18c3b4a3..fadec2d9 100644 --- a/doc/cookbook/pagination/pagination.cabal +++ b/doc/cookbook/pagination/pagination.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-pagination version: 2.1 synopsis: Pagination with Servant example @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-pagination diff --git a/doc/cookbook/sentry/sentry.cabal b/doc/cookbook/sentry/sentry.cabal index 282062b9..6cf89882 100644 --- a/doc/cookbook/sentry/sentry.cabal +++ b/doc/cookbook/sentry/sentry.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-sentry version: 0.1 synopsis: Collecting runtime exceptions using Sentry @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-sentry diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal index 323fa7f1..e6ad30e9 100644 --- a/doc/cookbook/structuring-apis/structuring-apis.cabal +++ b/doc/cookbook/structuring-apis/structuring-apis.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-structuring-apis version: 0.1 synopsis: Example that shows how APIs can be structured @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-structuring-apis diff --git a/doc/cookbook/testing/testing.cabal b/doc/cookbook/testing/testing.cabal index 56067a8c..dcf91c50 100644 --- a/doc/cookbook/testing/testing.cabal +++ b/doc/cookbook/testing/testing.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-testing version: 0.0.1 synopsis: Common testing patterns in Servant apps @@ -9,7 +10,6 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-testing diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal index 8cac3fc4..85aafc48 100644 --- a/doc/cookbook/using-custom-monad/using-custom-monad.cabal +++ b/doc/cookbook/using-custom-monad/using-custom-monad.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-using-custom-monad version: 0.1 synopsis: Using custom monad to pass a state between handlers @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-using-custom-monad diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal index 02179703..237ae764 100644 --- a/doc/cookbook/using-free-client/using-free-client.cabal +++ b/doc/cookbook/using-free-client/using-free-client.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-using-free-client version: 0.1 synopsis: Using Free client @@ -7,7 +8,6 @@ license-file: ../../../servant/LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7 executable cookbook-using-free-client diff --git a/doc/cookbook/uverb/uverb.cabal b/doc/cookbook/uverb/uverb.cabal index 80dc1b06..b7799959 100644 --- a/doc/cookbook/uverb/uverb.cabal +++ b/doc/cookbook/uverb/uverb.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: cookbook-uverb version: 0.0.1 synopsis: How to use the 'UVerb' type. @@ -9,7 +10,6 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.7 executable cookbook-uverb diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index a2844e9e..4d4d9d7d 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: tutorial version: 0.10 synopsis: The servant tutorial @@ -11,7 +12,6 @@ license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple -cabal-version: >=1.10 tested-with: GHC==8.6.5 GHC==8.8.3, GHC ==8.10.7 diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal index 7b8279b1..32f6d3bb 100644 --- a/servant-auth/servant-auth-client/servant-auth-client.cabal +++ b/servant-auth/servant-auth-client/servant-auth-client.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-auth-client version: 0.4.1.0 synopsis: servant-client/servant-auth compatibility @@ -17,7 +18,6 @@ license: BSD-3-Clause license-file: LICENSE tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 build-type: Simple -cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal index 10453fc0..bbcfa90c 100644 --- a/servant-auth/servant-auth-docs/servant-auth-docs.cabal +++ b/servant-auth/servant-auth-docs/servant-auth-docs.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-auth-docs version: 0.2.10.0 synopsis: servant-docs/servant-auth compatibility @@ -17,7 +18,6 @@ license: BSD-3-Clause license-file: LICENSE tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 build-type: Custom -cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal index b300b2ac..94b38184 100644 --- a/servant-auth/servant-auth-server/servant-auth-server.cabal +++ b/servant-auth/servant-auth-server/servant-auth-server.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-auth-server version: 0.4.6.0 synopsis: servant-server/servant-auth compatibility @@ -17,7 +18,6 @@ license: BSD-3-Clause license-file: LICENSE tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 build-type: Simple -cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal index d524533e..29353e6c 100644 --- a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal +++ b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-auth-swagger version: 0.2.10.1 synopsis: servant-swagger/servant-auth compatibility @@ -17,7 +18,6 @@ license: BSD-3-Clause license-file: LICENSE tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 build-type: Simple -cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal index 36528d3e..a845cad5 100644 --- a/servant-auth/servant-auth/servant-auth.cabal +++ b/servant-auth/servant-auth/servant-auth.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-auth version: 0.4.0.0 synopsis: Authentication combinators for servant @@ -19,7 +20,6 @@ license: BSD-3-Clause license-file: LICENSE tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 build-type: Simple -cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 21ac7923..976961ce 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-client-core version: 0.18.3 diff --git a/servant-client-ghcjs/servant-client-ghcjs.cabal b/servant-client-ghcjs/servant-client-ghcjs.cabal index 2a2a68ad..3e43f0f2 100644 --- a/servant-client-ghcjs/servant-client-ghcjs.cabal +++ b/servant-client-ghcjs/servant-client-ghcjs.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-client-ghcjs version: 0.16 synopsis: diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index e0e634ec..e8643f52 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-client version: 0.18.3 diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index ccb94c9e..8360a21b 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/servant-conduit/servant-conduit.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-conduit version: 0.15.1 diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 857e87a9..c58c64d4 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-docs version: 0.11.9 diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index d438ff38..7c1068e6 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-foreign version: 0.15.4 diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 2f86935c..c1a6c87f 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-http-streams version: 0.18.3 diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index cdf55fdf..96fbd2bb 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-machines version: 0.15.1 diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index 4ed0ff02..4a1e36e1 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-pipes version: 0.15.3 @@ -51,7 +51,7 @@ test-suite example , bytestring , http-media , servant - , pipes + , pipes , pipes-safe , servant-pipes , pipes-bytestring >=2.1.6 && <2.2 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 6fac8a93..2a63f940 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant-server version: 0.18.3 diff --git a/servant-swagger/example/example.cabal b/servant-swagger/example/example.cabal index 6abc75f6..286d2035 100644 --- a/servant-swagger/example/example.cabal +++ b/servant-swagger/example/example.cabal @@ -1,15 +1,15 @@ +cabal-version: 2.2 name: example version: 1.0 synopsis: servant-swagger demonstration description: servant-swagger demonstration -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: David Johnson, Nickolay Kudasov maintainer: nickolay.kudasov@gmail.com copyright: (c) 2015-2016, Servant contributors category: Web build-type: Simple -cabal-version: >=1.10 data-files: swagger.json diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal index f4595e10..a68d14e2 100644 --- a/servant-swagger/servant-swagger.cabal +++ b/servant-swagger/servant-swagger.cabal @@ -1,3 +1,4 @@ +cabal-version: 2.2 name: servant-swagger version: 1.1.11 synopsis: Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API. @@ -20,14 +21,13 @@ description: * and [many others](http://swagger.io/open-source-integrations/). homepage: https://github.com/haskell-servant/servant/servant-swagger bug-reports: https://github.com/haskell-servant/servant/issues -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: (c) 2015-2018, Servant contributors category: Web, Servant, Swagger build-type: Custom -cabal-version: 1.18 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 extra-source-files: diff --git a/servant/servant.cabal b/servant/servant.cabal index 7b7e3150..f5f973bb 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,4 +1,4 @@ -cabal-version: >=1.10 +cabal-version: 2.2 name: servant version: 0.18.3 diff --git a/servant/src/Servant/Types/SourceT.hs b/servant/src/Servant/Types/SourceT.hs index 879313f9..84cb4b6a 100644 --- a/servant/src/Servant/Types/SourceT.hs +++ b/servant/src/Servant/Types/SourceT.hs @@ -319,7 +319,7 @@ fromActionStep stop action = loop where -- | Read file. -- -- >>> foreach fail BS.putStr (readFile "servant.cabal") --- cabal-version: >=1.10 +-- cabal-version: 2.2 -- name: servant -- ... --