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

Merge pull request #1224 from haskell-servant/forward-8.8

Browse source 
Forward 8.8
This commit is contained in:
Oleg Grenrus 2019-09-29 14:15:58 +03:00 committed by GitHub
commit 164f75711b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 126 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
.travis.yml
View file

@ -4,7 +4,7 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.5.20190908
# version: 0.5.20190916
#
language: c
dist: xenial
@ -33,6 +33,8 @@ matrix:
include:
- compiler: ghcjs-8.4
addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
- compiler: ghc-8.8.1
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
- compiler: ghc-8.6.5
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
- compiler: ghc-8.4.4
@ -124,7 +126,7 @@ install:
- cat $CABALHOME/config
- rm -fv cabal.project cabal.project.local cabal.project.freeze
- travis_retry ${CABAL} v2-update -v
- if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan | color_cabal_output) ; fi
- if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan --constraint='cabal-plan ^>=0.6.0.0' --constraint='cabal-plan +exe' | color_cabal_output) ; fi
- if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover | color_cabal_output) ; fi
# Generate cabal.project
- rm -rf cabal.project cabal.project.local cabal.project.freeze
@ -132,7 +134,6 @@ install:
- |
echo "packages: servant" >> cabal.project
if ! $GHCJS ; then echo "packages: servant-client" >> cabal.project ; fi
echo "packages: servant-jsaddle" >> cabal.project
echo "packages: servant-client-core" >> cabal.project
if ! $GHCJS ; then echo "packages: servant-http-streams" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: servant-docs" >> cabal.project ; fi
@ -142,14 +143,13 @@ install:
if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: servant-jsaddle" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-sqlite-simple" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/https" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/pagination" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi
@ -158,24 +158,21 @@ install:
- |
echo "constraints: foundation >=0.0.14" >> cabal.project
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
echo "allow-newer: servant-quickcheck:servant" >> cabal.project
echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "optimization: False" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true
- cat cabal.project.local || true
- if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
- if [ -f "servant-client/configure.ac" ]; then (cd "servant-client" && autoreconf -i); fi
- if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi
- if [ -f "servant-client-core/configure.ac" ]; then (cd "servant-client-core" && autoreconf -i); fi
- if [ -f "servant-http-streams/configure.ac" ]; then (cd "servant-http-streams" && autoreconf -i); fi
- if [ -f "servant-docs/configure.ac" ]; then (cd "servant-docs" && autoreconf -i); fi
@ -185,14 +182,13 @@ install:
- if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi
- if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi
- if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi
- if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi
- if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi
- if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi
- if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi
- if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi
- if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi
- if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi
- if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi
- if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
- if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi
- if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi
- if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
@ -215,7 +211,6 @@ script:
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
- PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
- PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"
- PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"
- PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"
- PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"
- PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"
@ -225,14 +220,13 @@ script:
- PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"
- PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"
- PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"
- PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"
- PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"
- PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"
- PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"
- PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"
- PKGDIR_cookbook_db_sqlite_simple="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-sqlite-simple-[0-9.]*')"
- PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"
- PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"
- PKGDIR_cookbook_https="$(find . -maxdepth 1 -type d -regex '.*/cookbook-https-[0-9.]*')"
- PKGDIR_cookbook_pagination="$(find . -maxdepth 1 -type d -regex '.*/cookbook-pagination-[0-9.]*')"
- PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"
- PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"
@ -244,7 +238,6 @@ script:
- |
echo "packages: ${PKGDIR_servant}" >> cabal.project
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi
echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi
@ -254,14 +247,13 @@ script:
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_sqlite_simple}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_https}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_pagination}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi
if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi
@ -270,21 +262,47 @@ script:
- |
echo "constraints: foundation >=0.0.14" >> cabal.project
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
echo "allow-newer: servant-quickcheck:servant" >> cabal.project
echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "optimization: False" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true
- cat cabal.project.local || true
- |
pkgdir() {
case $1 in
servant) echo ${PKGDIR_servant} ;;
servant-client) echo ${PKGDIR_servant_client} ;;
servant-client-core) echo ${PKGDIR_servant_client_core} ;;
servant-http-streams) echo ${PKGDIR_servant_http_streams} ;;
servant-docs) echo ${PKGDIR_servant_docs} ;;
servant-foreign) echo ${PKGDIR_servant_foreign} ;;
servant-server) echo ${PKGDIR_servant_server} ;;
tutorial) echo ${PKGDIR_tutorial} ;;
servant-machines) echo ${PKGDIR_servant_machines} ;;
servant-conduit) echo ${PKGDIR_servant_conduit} ;;
servant-pipes) echo ${PKGDIR_servant_pipes} ;;
servant-jsaddle) echo ${PKGDIR_servant_jsaddle} ;;
cookbook-basic-auth) echo ${PKGDIR_cookbook_basic_auth} ;;
cookbook-curl-mock) echo ${PKGDIR_cookbook_curl_mock} ;;
cookbook-basic-streaming) echo ${PKGDIR_cookbook_basic_streaming} ;;
cookbook-db-postgres-pool) echo ${PKGDIR_cookbook_db_postgres_pool} ;;
cookbook-file-upload) echo ${PKGDIR_cookbook_file_upload} ;;
cookbook-generic) echo ${PKGDIR_cookbook_generic} ;;
cookbook-pagination) echo ${PKGDIR_cookbook_pagination} ;;
cookbook-testing) echo ${PKGDIR_cookbook_testing} ;;
cookbook-structuring-apis) echo ${PKGDIR_cookbook_structuring_apis} ;;
cookbook-using-custom-monad) echo ${PKGDIR_cookbook_using_custom_monad} ;;
cookbook-using-free-client) echo ${PKGDIR_cookbook_using_free_client} ;;
esac
}
- echo -en 'travis_fold:end:unpack\\r'
# Building with tests and benchmarks...
- echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
@ -293,7 +311,7 @@ script:
- echo -en 'travis_fold:end:build-everything\\r'
# Testing...
- if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
- if $GHCJS ; then for testexe in $(cabal-plan list-bins '*:test:*' | awk '{ print $2 }'); do echo $testexe; nodejs ${testexe}.jsexe/all.js; done ; fi
- if $GHCJS ; then cabal-plan list-bins '*:test:*' | while read -r line; do testpkg=$(echo "$line" | perl -pe 's/:.*//'); testexe=$(echo "$line" | awk '{ print $2 }'); echo "testing $textexe in package $textpkg"; (cd "$(pkgdir $testpkg)" && nodejs "$testexe".jsexe/all.js); done ; fi
# haddock...
- echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
- if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi

35
cabal.project
View file

@ -1,7 +1,6 @@
packages:
servant/
servant-client/
servant-jsaddle/
servant-client-core/
servant-http-streams/
servant-docs/
@ -9,21 +8,27 @@ packages:
servant-server/
doc/tutorial/
-- servant streaming
packages:
servant-machines/
servant-conduit/
servant-pipes/
-- doc/cookbook/*/*.cabal
-- servant GHCJS
packages:
servant-jsaddle/
-- Cookbooks
packages:
doc/cookbook/basic-auth
doc/cookbook/curl-mock
doc/cookbook/basic-streaming
doc/cookbook/db-postgres-pool
doc/cookbook/db-sqlite-simple
-- doc/cookbook/db-sqlite-simple
doc/cookbook/file-upload
doc/cookbook/generic
-- doc/cookbook/hoist-server-with-context
doc/cookbook/https
-- doc/cookbook/https
-- doc/cookbook/jwt-and-basic-auth/
doc/cookbook/pagination
-- doc/cookbook/sentry
@ -44,26 +49,16 @@ constraints:
foundation >=0.0.14,
memory <0.14.12 || >0.14.12
allow-newer:
-- servant-pagination:servant, servant-pagination:servant-server,
-- servant-multipart:servant, servant-multipart:servant-server,
-- servant-auth-server:servant, servant-auth-server:servant-server,
-- servant-js:servant, servant-js:servant-foreign
-- servant-quickcheck
allow-newer:
servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
servant-quickcheck:hspec,
servant-quickcheck:http-client
-- constraints: semigroups ^>=0.19
-- constraints: hashable ^>=1.3
-- constraints: network ^>=3.1
-- constraints: machines ^>=0.7
allow-newer: aeson-pretty-0.8.7:base-compat
allow-newer: vault-0.3.1.2:hashable
allow-newer: psqueues-0.2.7.1:hashable
allow-newer: sqlite-simple-0.4.16.0:semigroups
allow-newer: direct-sqlite-2.3.24:semigroups
allow-newer: io-streams-1.5.1.0:network
allow-newer: io-streams-1.5.1.0:primitive
allow-newer: openssl-streams-1.2.2.0:network
-- MonadFail
-- https://github.com/nurpax/sqlite-simple/issues/74
constraints: sqlite-simple < 0

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-basic-auth
main-is: BasicAuth.lhs

4
doc/cookbook/basic-streaming/basic-streaming.cabal
View file

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-basic-streaming
main-is: Streaming.lhs
@ -17,7 +17,7 @@ executable cookbook-basic-streaming
ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts
hs-source-dirs: .
build-depends: base >= 4.8 && <4.13
build-depends: base >= 4.8 && <5
, aeson
, bytestring
, servant

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbock-curl-mock
main-is: CurlMock.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-db-postgres-pool
main-is: PostgresPool.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-db-sqlite-simple
main-is: DBConnection.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-file-upload
main-is: FileUpload.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-using-custom-monad
main-is: Generic.lhs

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

@ -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
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-hoist-server-with-context
main-is: HoistServerWithContext.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-https
main-is: Https.lhs

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

@ -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
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-jwt-and-basic-auth
main-is: JWTAndBasicAuth.lhs

4
doc/cookbook/pagination/pagination.cabal
View file

@ -8,14 +8,14 @@ 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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-pagination
main-is: Pagination.lhs
build-tool-depends: markdown-unlit:markdown-unlit
default-language: Haskell2010
ghc-options: -Wall -pgmL markdown-unlit
build-depends: base >= 4.8 && <4.13
build-depends: base >= 4.9 && <5
, aeson
, servant
, servant-server

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-sentry
main-is: Sentry.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-structuring-apis
main-is: StructuringApis.lhs

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

@ -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
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-testing
main-is: Testing.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-using-custom-monad
main-is: UsingCustomMonad.lhs

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

@ -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.4.4, GHC==8.6.5, GHC==8.8.1
executable cookbook-using-free-client
main-is: UsingFreeClient.lhs

5
doc/tutorial/tutorial.cabal
View file

@ -17,6 +17,7 @@ tested-with:
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.1
extra-source-files:
static/index.html
static/ui.js
@ -34,7 +35,7 @@ library
-- Packages `servant` depends on.
-- We don't need to specify bounds here as this package is never released.
build-depends:
base >= 4.7 && <4.13
base >= 4.7 && <5
, aeson
, attoparsec
, base-compat
@ -69,7 +70,7 @@ library
, lucid >= 2.9.11 && < 2.10
, random >= 1.1 && < 1.2
, servant-js >= 0.9 && < 0.10
, time >= 1.6.0.1 && < 1.9
, time >= 1.6.0.1 && < 1.10
-- For legacy tools, we need to specify build-depends too
build-depends: markdown-unlit >= 0.5.0 && <0.6

7
servant-client-core/servant-client-core.cabal
View file

@ -21,6 +21,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
, GHCJS == 8.4
extra-source-files:
@ -54,13 +55,13 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5
, text >= 1.2.3.0 && < 1.3
, transformers >= 0.5.2.0 && < 0.6
, template-haskell >= 2.11.1.0 && < 2.15
, template-haskell >= 2.11.1.0 && < 2.16
if !impl(ghc >= 8.2)
build-depends:
@ -74,7 +75,7 @@ library
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
aeson >= 1.4.1.0 && < 1.5
, base-compat >= 0.10.5 && < 0.11
, base-compat >= 0.10.5 && < 0.12
, base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.10.0 && < 0.11
, free >= 5.1 && < 5.2

7
servant-client/servant-client.cabal
View file

@ -25,6 +25,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md
@ -44,14 +45,14 @@ 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.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5
, mtl >= 2.2.2 && < 2.3
, stm >= 2.4.5.1 && < 2.6
, text >= 1.2.3.0 && < 1.3
, time >= 1.6.0.1 && < 1.9
, time >= 1.6.0.1 && < 1.10
, transformers >= 0.5.2.0 && < 0.6
if !impl(ghc >= 8.2)
@ -67,7 +68,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.10.5 && < 0.11
base-compat >= 0.10.5 && < 0.12
, http-client >= 0.5.13.1 && < 0.7
, http-media >= 0.7.1.3 && < 0.9
, http-types >= 0.12.2 && < 0.13

1
servant-conduit/servant-conduit.cabal
View file

@ -22,6 +22,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md

5
servant-docs/CHANGELOG.md
View file

@ -1,6 +1,11 @@
[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-docs/CHANGELOG.md)
[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
0.11.4
------
- Drop dependency on `control-monad-omega` in favor of `Data.Universe.Helpers` from `universe-base`.
0.11.3
------

12
servant-docs/servant-docs.cabal
View file

@ -1,7 +1,6 @@
cabal-version: >=1.10
name: servant-docs
version: 0.11.3
x-revision: 1
version: 0.11.4
synopsis: generate API docs for your servant webservice
category: Servant, Web
@ -25,6 +24,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md
@ -46,7 +46,7 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, text >= 1.2.3.0 && < 1.3
@ -59,14 +59,14 @@ library
build-depends:
aeson >= 1.4.1.0 && < 1.5
, aeson-pretty >= 0.8.5 && < 0.9
, base-compat >= 0.10.5 && < 0.11
, base-compat >= 0.10.5 && < 0.12
, case-insensitive >= 1.2.0.11 && < 1.3
, control-monad-omega >= 0.3.1 && < 0.4
, hashable >= 1.2.7.0 && < 1.4
, http-media >= 0.7.1.3 && < 0.9
, http-types >= 0.12.2 && < 0.13
, lens >= 4.17 && < 4.18
, lens >= 4.17 && < 4.19
, string-conversions >= 0.4.0.1 && < 0.5
, universe-base >= 1.1.1 && < 1.2
, unordered-containers >= 0.2.9.0 && < 0.3
hs-source-dirs: src

17
servant-docs/src/Servant/Docs/Internal.hs
View file

@ -27,7 +27,6 @@ import Control.Arrow
import Control.Lens
(makeLenses, mapped, over, traversed, view, (%~), (&), (.~),
(<>~), (^.), (|>))
import qualified Control.Monad.Omega as Omega
import qualified Data.ByteString.Char8 as BSC
import Data.ByteString.Lazy.Char8
(ByteString)
@ -65,6 +64,8 @@ import Servant.API
import Servant.API.ContentTypes
import Servant.API.TypeLevel
import qualified Data.Universe.Helpers as U
import qualified Data.HashMap.Strict as HM
import qualified Data.Text as T
import qualified Network.HTTP.Media as M
@ -479,22 +480,22 @@ samples = map ("",)
-- | Default sample Generic-based inputs/outputs.
defaultSamples :: forall a. (Generic a, GToSample (Rep a)) => Proxy a -> [(Text, a)]
defaultSamples _ = Omega.runOmega $ second to <$> gtoSamples (Proxy :: Proxy (Rep a))
defaultSamples _ = second to <$> gtoSamples (Proxy :: Proxy (Rep a))
-- | @'ToSample'@ for Generics.
--
-- The use of @'Omega'@ allows for more productive sample generation.
-- Note: we use combinators from "Universe.Data.Helpers" for more productive sample generation.
class GToSample t where
gtoSamples :: proxy t -> Omega.Omega (Text, t x)
gtoSamples :: proxy t -> [(Text, t x)]
instance GToSample U1 where
gtoSamples _ = Omega.each (singleSample U1)
gtoSamples _ = singleSample U1
instance GToSample V1 where
gtoSamples _ = empty
instance (GToSample p, GToSample q) => GToSample (p :*: q) where
gtoSamples _ = render <$> ps <*> qs
gtoSamples _ = U.cartesianProduct render ps qs
where
ps = gtoSamples (Proxy :: Proxy p)
qs = gtoSamples (Proxy :: Proxy q)
@ -503,13 +504,13 @@ instance (GToSample p, GToSample q) => GToSample (p :*: q) where
| otherwise = (ta <> ", " <> tb, a :*: b)
instance (GToSample p, GToSample q) => GToSample (p :+: q) where
gtoSamples _ = lefts <|> rights
gtoSamples _ = lefts U.+++ rights
where
lefts = second L1 <$> gtoSamples (Proxy :: Proxy p)
rights = second R1 <$> gtoSamples (Proxy :: Proxy q)
instance ToSample a => GToSample (K1 i a) where
gtoSamples _ = second K1 <$> Omega.each (toSamples (Proxy :: Proxy a))
gtoSamples _ = second K1 <$> toSamples (Proxy :: Proxy a)
instance (GToSample f) => GToSample (M1 i a f) where
gtoSamples _ = second M1 <$> gtoSamples (Proxy :: Proxy f)

7
servant-foreign/servant-foreign.cabal
View file

@ -27,6 +27,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md
@ -46,7 +47,7 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.13
base >= 4.9 && < 4.14
, text >= 1.2.3.0 && < 1.3
-- Servant dependencies
@ -56,8 +57,8 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.10.5 && < 0.11
, lens >= 4.17 && < 4.18
base-compat >= 0.10.5 && < 0.12
, lens >= 4.17 && < 4.19
, http-types >= 0.12.2 && < 0.13
hs-source-dirs: src

7
servant-http-streams/servant-http-streams.cabal
View file

@ -25,6 +25,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md
@ -42,13 +43,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.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, containers >= 0.5.7.1 && < 0.7
, deepseq >= 1.4.2.0 && < 1.5
, mtl >= 2.2.2 && < 2.3
, text >= 1.2.3.0 && < 1.3
, time >= 1.6.0.1 && < 1.9
, time >= 1.6.0.1 && < 1.10
, transformers >= 0.5.2.0 && < 0.6
if !impl(ghc >= 8.2)
@ -64,7 +65,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.10.5 && < 0.11
base-compat >= 0.10.5 && < 0.12
, case-insensitive
, http-streams >= 0.8.6.1 && < 0.9
, http-media >= 0.7.1.3 && < 0.9

1
servant-machines/servant-machines.cabal
View file

@ -22,6 +22,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md

1
servant-pipes/servant-pipes.cabal
View file

@ -21,6 +21,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md

5
servant-server/servant-server.cabal
View file

@ -28,6 +28,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
extra-source-files:
CHANGELOG.md
@ -68,7 +69,7 @@ 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.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, containers >= 0.5.7.1 && < 0.7
, mtl >= 2.2.2 && < 2.3
@ -85,7 +86,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.10.5 && < 0.11
base-compat >= 0.10.5 && < 0.12
, base64-bytestring >= 1.0.0.1 && < 1.1
, exceptions >= 0.10.0 && < 0.11
, http-media >= 0.7.1.3 && < 0.9

5
servant/servant.cabal
View file

@ -25,6 +25,7 @@ tested-with:
|| ==8.2.2
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
, GHCJS == 8.4
extra-source-files:
@ -89,7 +90,7 @@ library
--
-- note: mtl lower bound is so low because of GHC-7.8
build-depends:
base >= 4.9 && < 4.13
base >= 4.9 && < 4.14
, bytestring >= 0.10.8.1 && < 0.11
, mtl >= 2.2.2 && < 2.3
, transformers >= 0.5.2.0 && < 0.6
@ -105,7 +106,7 @@ library
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
-- Here can be exceptions if we really need features from the newer versions.
build-depends:
base-compat >= 0.10.5 && < 0.11
base-compat >= 0.10.5 && < 0.12
, aeson >= 1.4.1.0 && < 1.5
, attoparsec >= 0.13.2.2 && < 0.14
, bifunctors >= 5.5.3 && < 5.6