eeva
/
servant
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Matthieu Coudron 2022-01-04 22:06:23 +01:00 committed by GitHub
parent 29d2553e74
commit 73c87bc2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/cookbook/basic-auth/basic-auth.cabal
View File

@ -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

2
doc/cookbook/basic-streaming/basic-streaming.cabal
View File

@ -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

2
doc/cookbook/curl-mock/curl-mock.cabal
View File

@ -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

2
doc/cookbook/custom-errors/custom-errors.cabal
View File

@ -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

2
doc/cookbook/db-mysql-basics/mysql-basics.cabal
View File

@ -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: .

2
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
View File

@ -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

2
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
View File

@ -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

2
doc/cookbook/file-upload/file-upload.cabal
View File

@ -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

2
doc/cookbook/generic/generic.cabal
View File

@ -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

2
doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
View File

@ -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

2
doc/cookbook/https/https.cabal
View File

@ -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

2
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
View File

@ -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

2
doc/cookbook/open-id-connect/OpenIdConnect.cabal
View File

@ -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

2
doc/cookbook/pagination/pagination.cabal
View File

@ -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

2
doc/cookbook/sentry/sentry.cabal
View File

@ -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

2
doc/cookbook/structuring-apis/structuring-apis.cabal
View File

@ -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

2
doc/cookbook/testing/testing.cabal
View File

@ -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

2
doc/cookbook/using-custom-monad/using-custom-monad.cabal
View File

@ -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

2
doc/cookbook/using-free-client/using-free-client.cabal
View File

@ -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

2
doc/cookbook/uverb/uverb.cabal
View File

@ -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

2
doc/tutorial/tutorial.cabal
View File

@ -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

2
servant-auth/servant-auth-client/servant-auth-client.cabal
View File

@ -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

2
servant-auth/servant-auth-docs/servant-auth-docs.cabal
View File

@ -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

2
servant-auth/servant-auth-server/servant-auth-server.cabal
View File

@ -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

2
servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
View File

@ -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

2
servant-auth/servant-auth/servant-auth.cabal
View File

@ -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

2
servant-client-core/servant-client-core.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-client-core
version: 0.18.3

2
servant-client-ghcjs/servant-client-ghcjs.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-client-ghcjs
version: 0.16
synopsis:

2
servant-client/servant-client.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-client
version: 0.18.3

2
servant-conduit/servant-conduit.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-conduit
version: 0.15.1

2
servant-docs/servant-docs.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-docs
version: 0.11.9

2
servant-foreign/servant-foreign.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-foreign
version: 0.15.4

2
servant-http-streams/servant-http-streams.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-http-streams
version: 0.18.3

2
servant-machines/servant-machines.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-machines
version: 0.15.1

4
servant-pipes/servant-pipes.cabal
View File

@ -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

2
servant-server/servant-server.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant-server
version: 0.18.3

4
servant-swagger/example/example.cabal
View File

@ -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

4
servant-swagger/servant-swagger.cabal
View File

@ -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:

2
servant/servant.cabal
View File

@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 2.2
name: servant
version: 0.18.3

2
servant/src/Servant/Types/SourceT.hs
View File

@ -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
-- ...
--