git.iko.soy/typeable/servant
on master help sign in
Relax bounds for ghc-8.8
commitf089f8d0b2e6fad4a3a1c5607384e9202ae5829a authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 11 Sep 2019, 10:34 (7 years ago) parent19dee18
29 files changed+90−85
compare with master
unifiedsplit
.travis.yml+39−45 cabal.project+1−1 doc/cookbook/basic-auth/basic-auth.cabal+1−1 doc/cookbook/basic-streaming/basic-streaming.cabal+2−2 doc/cookbook/curl-mock/curl-mock.cabal+1−1 doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1 doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1 doc/cookbook/file-upload/file-upload.cabal+1−1 doc/cookbook/generic/generic.cabal+1−1 doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1 doc/cookbook/https/https.cabal+1−1 doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1 doc/cookbook/pagination/pagination.cabal+2−2 doc/cookbook/sentry/sentry.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/testing/testing.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/cookbook/using-free-client/using-free-client.cabal+1−1 doc/tutorial/tutorial.cabal+3−2 servant-client-core/servant-client-core.cabal+4−3 servant-client/servant-client.cabal+4−3 servant-conduit/servant-conduit.cabal+1 servant-docs/servant-docs.cabal+4−3 servant-foreign/servant-foreign.cabal+4−3 servant-http-streams/servant-http-streams.cabal+4−3 servant-machines/servant-machines.cabal+1 servant-pipes/servant-pipes.cabal+1 servant-server/servant-server.cabal+3−2 servant/servant.cabal+3−2
.travis.yml+39−45
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.5.20190908
7+# version: 0.5.20190916
88#
99language: c
1010dist: xenial
@@ -33,6 +33,8 @@ matrix:
3333 include:
3434 - compiler: ghcjs-8.4
3535 addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}
36+ - compiler: ghc-8.8.1
37+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
3638 - compiler: ghc-8.6.5
3739 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
3840 - compiler: ghc-8.4.4
@@ -124,7 +126,7 @@ install:
124126 - cat $CABALHOME/config
125127 - rm -fv cabal.project cabal.project.local cabal.project.freeze
126128 - travis_retry ${CABAL} v2-update -v
127− - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 cabal-plan | color_cabal_output) ; fi
129+ - 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
128130 - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 hspec-discover | color_cabal_output) ; fi
129131 # Generate cabal.project
130132 - rm -rf cabal.project cabal.project.local cabal.project.freeze
@@ -132,7 +134,6 @@ install:
132134 - |
133135 echo "packages: servant" >> cabal.project
134136 if ! $GHCJS ; then echo "packages: servant-client" >> cabal.project ; fi
135− echo "packages: servant-jsaddle" >> cabal.project
136137 echo "packages: servant-client-core" >> cabal.project
137138 if ! $GHCJS ; then echo "packages: servant-http-streams" >> cabal.project ; fi
138139 if ! $GHCJS ; then echo "packages: servant-docs" >> cabal.project ; fi
@@ -142,14 +143,13 @@ install:
142143 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
143144 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
144145 if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
146+ if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: servant-jsaddle" >> cabal.project ; fi
145147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
146148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
147149 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
148150 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi
149− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-sqlite-simple" >> cabal.project ; fi
150151 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi
151152 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi
152− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/https" >> cabal.project ; fi
153153 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/pagination" >> cabal.project ; fi
154154 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi
155155 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi
@@ -158,36 +158,21 @@ install:
158158 - |
159159 echo "constraints: foundation >=0.0.14" >> cabal.project
160160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
161−<<<<<<< HEAD
162− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
163− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
164− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
165− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
166− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
167−=======
168161 echo "constraints: sqlite-simple < 0" >> cabal.project
169162 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
170−>>>>>>> 8ed0e9e2... Less allow-newer
171163 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
172164 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
173165 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
174166 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
175167 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
176−<<<<<<< HEAD
177− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
178− echo "optimization: False" >> cabal.project
179− - "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"
180−=======
181168 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
182169 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
183170 echo "optimization: False" >> cabal.project
184− - "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-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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
185−>>>>>>> 8ed0e9e2... Less allow-newer
171+ - "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"
186172 - cat cabal.project || true
187173 - cat cabal.project.local || true
188174 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
189175 - if [ -f "servant-client/configure.ac" ]; then (cd "servant-client" && autoreconf -i); fi
190− - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi
191176 - if [ -f "servant-client-core/configure.ac" ]; then (cd "servant-client-core" && autoreconf -i); fi
192177 - if [ -f "servant-http-streams/configure.ac" ]; then (cd "servant-http-streams" && autoreconf -i); fi
193178 - if [ -f "servant-docs/configure.ac" ]; then (cd "servant-docs" && autoreconf -i); fi
@@ -197,14 +182,13 @@ install:
197182 - if [ -f "servant-machines/configure.ac" ]; then (cd "servant-machines" && autoreconf -i); fi
198183 - if [ -f "servant-conduit/configure.ac" ]; then (cd "servant-conduit" && autoreconf -i); fi
199184 - if [ -f "servant-pipes/configure.ac" ]; then (cd "servant-pipes" && autoreconf -i); fi
185+ - if [ -f "servant-jsaddle/configure.ac" ]; then (cd "servant-jsaddle" && autoreconf -i); fi
200186 - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then (cd "doc/cookbook/basic-auth" && autoreconf -i); fi
201187 - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi
202188 - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi
203189 - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi
204− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi
205190 - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi
206191 - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi
207− - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
208192 - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi
209193 - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi
210194 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
@@ -227,7 +211,6 @@ script:
227211 - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
228212 - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
229213 - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"
230− - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"
231214 - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"
232215 - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"
233216 - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"
@@ -237,14 +220,13 @@ script:
237220 - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"
238221 - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"
239222 - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"
223+ - PKGDIR_servant_jsaddle="$(find . -maxdepth 1 -type d -regex '.*/servant-jsaddle-[0-9.]*')"
240224 - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"
241225 - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"
242226 - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"
243227 - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"
244− - PKGDIR_cookbook_db_sqlite_simple="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-sqlite-simple-[0-9.]*')"
245228 - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"
246229 - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"
247− - PKGDIR_cookbook_https="$(find . -maxdepth 1 -type d -regex '.*/cookbook-https-[0-9.]*')"
248230 - PKGDIR_cookbook_pagination="$(find . -maxdepth 1 -type d -regex '.*/cookbook-pagination-[0-9.]*')"
249231 - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"
250232 - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"
@@ -256,7 +238,6 @@ script:
256238 - |
257239 echo "packages: ${PKGDIR_servant}" >> cabal.project
258240 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_client}" >> cabal.project ; fi
259− echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
260241 echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
261242 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project ; fi
262243 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_docs}" >> cabal.project ; fi
@@ -266,14 +247,13 @@ script:
266247 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
267248 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
268249 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
250+ if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project ; fi
269251 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
270252 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
271253 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
272254 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi
273− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_sqlite_simple}" >> cabal.project ; fi
274255 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi
275256 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi
276− if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_https}" >> cabal.project ; fi
277257 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_pagination}" >> cabal.project ; fi
278258 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi
279259 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi
@@ -282,33 +262,47 @@ script:
282262 - |
283263 echo "constraints: foundation >=0.0.14" >> cabal.project
284264 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
285−<<<<<<< HEAD
286− echo "allow-newer: servant-quickcheck:servant" >> cabal.project
287− echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
288− echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
289− echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
290− echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
291−=======
292265 echo "constraints: sqlite-simple < 0" >> cabal.project
293266 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
294−>>>>>>> 8ed0e9e2... Less allow-newer
295267 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
296268 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
297269 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
298270 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
299271 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
300−<<<<<<< HEAD
301− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
302− echo "optimization: False" >> cabal.project
303− - "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"
304−=======
305272 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
306273 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
307274 echo "optimization: False" >> cabal.project
308− - "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-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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
309−>>>>>>> 8ed0e9e2... Less allow-newer
275+ - "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"
310276 - cat cabal.project || true
311277 - cat cabal.project.local || true
278+ - |
279+ pkgdir() {
280+ case $1 in
281+ servant) echo ${PKGDIR_servant} ;;
282+ servant-client) echo ${PKGDIR_servant_client} ;;
283+ servant-client-core) echo ${PKGDIR_servant_client_core} ;;
284+ servant-http-streams) echo ${PKGDIR_servant_http_streams} ;;
285+ servant-docs) echo ${PKGDIR_servant_docs} ;;
286+ servant-foreign) echo ${PKGDIR_servant_foreign} ;;
287+ servant-server) echo ${PKGDIR_servant_server} ;;
288+ tutorial) echo ${PKGDIR_tutorial} ;;
289+ servant-machines) echo ${PKGDIR_servant_machines} ;;
290+ servant-conduit) echo ${PKGDIR_servant_conduit} ;;
291+ servant-pipes) echo ${PKGDIR_servant_pipes} ;;
292+ servant-jsaddle) echo ${PKGDIR_servant_jsaddle} ;;
293+ cookbook-basic-auth) echo ${PKGDIR_cookbook_basic_auth} ;;
294+ cookbook-curl-mock) echo ${PKGDIR_cookbook_curl_mock} ;;
295+ cookbook-basic-streaming) echo ${PKGDIR_cookbook_basic_streaming} ;;
296+ cookbook-db-postgres-pool) echo ${PKGDIR_cookbook_db_postgres_pool} ;;
297+ cookbook-file-upload) echo ${PKGDIR_cookbook_file_upload} ;;
298+ cookbook-generic) echo ${PKGDIR_cookbook_generic} ;;
299+ cookbook-pagination) echo ${PKGDIR_cookbook_pagination} ;;
300+ cookbook-testing) echo ${PKGDIR_cookbook_testing} ;;
301+ cookbook-structuring-apis) echo ${PKGDIR_cookbook_structuring_apis} ;;
302+ cookbook-using-custom-monad) echo ${PKGDIR_cookbook_using_custom_monad} ;;
303+ cookbook-using-free-client) echo ${PKGDIR_cookbook_using_free_client} ;;
304+ esac
305+ }
312306 - echo -en 'travis_fold:end:unpack\\r'
313307 # Building with tests and benchmarks...
314308 - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
@@ -317,7 +311,7 @@ script:
317311 - echo -en 'travis_fold:end:build-everything\\r'
318312 # Testing...
319313 - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
320− - if $GHCJS ; then for testexe in $(cabal-plan list-bins '*:test:*' | awk '{ print $2 }'); do echo $testexe; nodejs ${testexe}.jsexe/all.js; done ; fi
314+ - 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
321315 # haddock...
322316 - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
323317 - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output ; fi
cabal.project+1−1
@@ -16,7 +16,7 @@ packages:
1616
1717-- servant GHCJS
1818packages:
19−-- servant-jsaddle/
19+ servant-jsaddle/
2020
2121-- Cookbooks
2222packages:
doc/cookbook/basic-auth/basic-auth.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-basic-auth
1414 main-is: BasicAuth.lhs
doc/cookbook/basic-streaming/basic-streaming.cabal+2−2
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-basic-streaming
1414 main-is: Streaming.lhs
@@ -17,7 +17,7 @@ executable cookbook-basic-streaming
1717 ghc-options: -Wall -pgmL markdown-unlit -threaded -rtsopts
1818
1919 hs-source-dirs: .
20− build-depends: base >= 4.8 && <4.13
20+ build-depends: base >= 4.8 && <5
2121 , aeson
2222 , bytestring
2323 , servant
doc/cookbook/curl-mock/curl-mock.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbock-curl-mock
1414 main-is: CurlMock.lhs
doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-db-postgres-pool
1414 main-is: PostgresPool.lhs
doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-db-sqlite-simple
1414 main-is: DBConnection.lhs
doc/cookbook/file-upload/file-upload.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/generic/generic.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-using-custom-monad
1414 main-is: Generic.lhs
doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1
@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==8.4.4, GHC==8.6.5
14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1515
1616executable cookbook-hoist-server-with-context
1717 main-is: HoistServerWithContext.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-https
1414 main-is: Https.lhs
doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1
@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1111category: Servant
1212build-type: Simple
1313cabal-version: >=1.10
14−tested-with: GHC==8.4.4, GHC==8.6.5
14+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1515
1616executable cookbook-jwt-and-basic-auth
1717 main-is: JWTAndBasicAuth.lhs
doc/cookbook/pagination/pagination.cabal+2−2
@@ -8,14 +8,14 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-pagination
1414 main-is: Pagination.lhs
1515 build-tool-depends: markdown-unlit:markdown-unlit
1616 default-language: Haskell2010
1717 ghc-options: -Wall -pgmL markdown-unlit
18− build-depends: base >= 4.8 && <4.13
18+ build-depends: base >= 4.9 && <5
1919 , aeson
2020 , servant
2121 , servant-server
doc/cookbook/sentry/sentry.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-sentry
1414 main-is: Sentry.lhs
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/testing/testing.cabal+1−1
@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1010category: Servant
1111build-type: Simple
1212cabal-version: >=1.10
13−tested-with: GHC==8.4.4, GHC==8.6.5
13+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1414
1515executable cookbook-testing
1616 main-is: Testing.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/cookbook/using-free-client/using-free-client.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-version: >=1.10
11−tested-with: GHC==8.4.4, GHC==8.6.5
11+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
1212
1313executable cookbook-using-free-client
1414 main-is: UsingFreeClient.lhs
doc/tutorial/tutorial.cabal+3−2
@@ -17,6 +17,7 @@ tested-with:
1717 GHC==8.2.2
1818 GHC==8.4.4
1919 GHC==8.6.5
20+ GHC==8.8.1
2021extra-source-files:
2122 static/index.html
2223 static/ui.js
@@ -34,7 +35,7 @@ library
3435 -- Packages `servant` depends on.
3536 -- We don't need to specify bounds here as this package is never released.
3637 build-depends:
37− base >= 4.7 && <4.13
38+ base >= 4.7 && <5
3839 , aeson
3940 , attoparsec
4041 , base-compat
@@ -69,7 +70,7 @@ library
6970 , lucid >= 2.9.11 && < 2.10
7071 , random >= 1.1 && < 1.2
7172 , servant-js >= 0.9 && < 0.10
72− , time >= 1.6.0.1 && < 1.9
73+ , time >= 1.6.0.1 && < 1.10
7374
7475 -- For legacy tools, we need to specify build-depends too
7576 build-depends: markdown-unlit >= 0.5.0 && <0.6
servant-client-core/servant-client-core.cabal+4−3
@@ -21,6 +21,7 @@ tested-with:
2121 || ==8.2.2
2222 || ==8.4.4
2323 || ==8.6.5
24+ || ==8.8.1
2425 , GHCJS == 8.4
2526
2627extra-source-files:
@@ -54,13 +55,13 @@ library
5455 --
5556 -- note: mtl lower bound is so low because of GHC-7.8
5657 build-depends:
57− base >= 4.9 && < 4.13
58+ base >= 4.9 && < 4.14
5859 , bytestring >= 0.10.8.1 && < 0.11
5960 , containers >= 0.5.7.1 && < 0.7
6061 , deepseq >= 1.4.2.0 && < 1.5
6162 , text >= 1.2.3.0 && < 1.3
6263 , transformers >= 0.5.2.0 && < 0.6
63− , template-haskell >= 2.11.1.0 && < 2.15
64+ , template-haskell >= 2.11.1.0 && < 2.16
6465
6566 if !impl(ghc >= 8.2)
6667 build-depends:
@@ -74,7 +75,7 @@ library
7475 -- Here can be exceptions if we really need features from the newer versions.
7576 build-depends:
7677 aeson >= 1.4.1.0 && < 1.5
77− , base-compat >= 0.10.5 && < 0.11
78+ , base-compat >= 0.10.5 && < 0.12
7879 , base64-bytestring >= 1.0.0.1 && < 1.1
7980 , exceptions >= 0.10.0 && < 0.11
8081 , free >= 5.1 && < 5.2
servant-client/servant-client.cabal+4−3
@@ -25,6 +25,7 @@ tested-with:
2525 || ==8.2.2
2626 || ==8.4.4
2727 || ==8.6.5
28+ || ==8.8.1
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -44,14 +45,14 @@ library
4445 -- Bundled with GHC: Lower bound to not force re-installs
4546 -- text and mtl are bundled starting with GHC-8.4
4647 build-depends:
47− base >= 4.9 && < 4.13
48+ base >= 4.9 && < 4.14
4849 , bytestring >= 0.10.8.1 && < 0.11
4950 , containers >= 0.5.7.1 && < 0.7
5051 , deepseq >= 1.4.2.0 && < 1.5
5152 , mtl >= 2.2.2 && < 2.3
5253 , stm >= 2.4.5.1 && < 2.6
5354 , text >= 1.2.3.0 && < 1.3
54− , time >= 1.6.0.1 && < 1.9
55+ , time >= 1.6.0.1 && < 1.10
5556 , transformers >= 0.5.2.0 && < 0.6
5657
5758 if !impl(ghc >= 8.2)
@@ -67,7 +68,7 @@ library
6768 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6869 -- Here can be exceptions if we really need features from the newer versions.
6970 build-depends:
70− base-compat >= 0.10.5 && < 0.11
71+ base-compat >= 0.10.5 && < 0.12
7172 , http-client >= 0.5.13.1 && < 0.7
7273 , http-media >= 0.7.1.3 && < 0.9
7374 , http-types >= 0.12.2 && < 0.13
servant-conduit/servant-conduit.cabal+1
@@ -22,6 +22,7 @@ tested-with:
2222 || ==8.2.2
2323 || ==8.4.4
2424 || ==8.6.5
25+ || ==8.8.1
2526
2627extra-source-files:
2728 CHANGELOG.md
servant-docs/servant-docs.cabal+4−3
@@ -24,6 +24,7 @@ tested-with:
2424 || ==8.2.2
2525 || ==8.4.4
2626 || ==8.6.5
27+ || ==8.8.1
2728
2829extra-source-files:
2930 CHANGELOG.md
@@ -45,7 +46,7 @@ library
4546 --
4647 -- note: mtl lower bound is so low because of GHC-7.8
4748 build-depends:
48− base >= 4.9 && < 4.13
49+ base >= 4.9 && < 4.14
4950 , bytestring >= 0.10.8.1 && < 0.11
5051 , text >= 1.2.3.0 && < 1.3
5152
@@ -58,12 +59,12 @@ library
5859 build-depends:
5960 aeson >= 1.4.1.0 && < 1.5
6061 , aeson-pretty >= 0.8.5 && < 0.9
61− , base-compat >= 0.10.5 && < 0.11
62+ , base-compat >= 0.10.5 && < 0.12
6263 , case-insensitive >= 1.2.0.11 && < 1.3
6364 , hashable >= 1.2.7.0 && < 1.4
6465 , http-media >= 0.7.1.3 && < 0.9
6566 , http-types >= 0.12.2 && < 0.13
66− , lens >= 4.17 && < 4.18
67+ , lens >= 4.17 && < 4.19
6768 , string-conversions >= 0.4.0.1 && < 0.5
6869 , universe-base >= 1.1.1 && < 1.2
6970 , unordered-containers >= 0.2.9.0 && < 0.3
servant-foreign/servant-foreign.cabal+4−3
@@ -27,6 +27,7 @@ tested-with:
2727 || ==8.2.2
2828 || ==8.4.4
2929 || ==8.6.5
30+ || ==8.8.1
3031
3132extra-source-files:
3233 CHANGELOG.md
@@ -46,7 +47,7 @@ library
4647 --
4748 -- note: mtl lower bound is so low because of GHC-7.8
4849 build-depends:
49− base >= 4.9 && < 4.13
50+ base >= 4.9 && < 4.14
5051 , text >= 1.2.3.0 && < 1.3
5152
5253 -- Servant dependencies
@@ -56,8 +57,8 @@ library
5657 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5758 -- Here can be exceptions if we really need features from the newer versions.
5859 build-depends:
59− base-compat >= 0.10.5 && < 0.11
60− , lens >= 4.17 && < 4.18
60+ base-compat >= 0.10.5 && < 0.12
61+ , lens >= 4.17 && < 4.19
6162 , http-types >= 0.12.2 && < 0.13
6263
6364 hs-source-dirs: src
servant-http-streams/servant-http-streams.cabal+4−3
@@ -25,6 +25,7 @@ tested-with:
2525 || ==8.2.2
2626 || ==8.4.4
2727 || ==8.6.5
28+ || ==8.8.1
2829
2930extra-source-files:
3031 CHANGELOG.md
@@ -42,13 +43,13 @@ library
4243 -- Bundled with GHC: Lower bound to not force re-installs
4344 -- text and mtl are bundled starting with GHC-8.4
4445 build-depends:
45− base >= 4.9 && < 4.13
46+ base >= 4.9 && < 4.14
4647 , bytestring >= 0.10.8.1 && < 0.11
4748 , containers >= 0.5.7.1 && < 0.7
4849 , deepseq >= 1.4.2.0 && < 1.5
4950 , mtl >= 2.2.2 && < 2.3
5051 , text >= 1.2.3.0 && < 1.3
51− , time >= 1.6.0.1 && < 1.9
52+ , time >= 1.6.0.1 && < 1.10
5253 , transformers >= 0.5.2.0 && < 0.6
5354
5455 if !impl(ghc >= 8.2)
@@ -64,7 +65,7 @@ library
6465 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6566 -- Here can be exceptions if we really need features from the newer versions.
6667 build-depends:
67− base-compat >= 0.10.5 && < 0.11
68+ base-compat >= 0.10.5 && < 0.12
6869 , case-insensitive
6970 , http-streams >= 0.8.6.1 && < 0.9
7071 , http-media >= 0.7.1.3 && < 0.9
servant-machines/servant-machines.cabal+1
@@ -22,6 +22,7 @@ tested-with:
2222 || ==8.2.2
2323 || ==8.4.4
2424 || ==8.6.5
25+ || ==8.8.1
2526
2627extra-source-files:
2728 CHANGELOG.md
servant-pipes/servant-pipes.cabal+1
@@ -21,6 +21,7 @@ tested-with:
2121 || ==8.2.2
2222 || ==8.4.4
2323 || ==8.6.5
24+ || ==8.8.1
2425
2526extra-source-files:
2627 CHANGELOG.md
servant-server/servant-server.cabal+3−2
@@ -28,6 +28,7 @@ tested-with:
2828 || ==8.2.2
2929 || ==8.4.4
3030 || ==8.6.5
31+ || ==8.8.1
3132
3233extra-source-files:
3334 CHANGELOG.md
@@ -68,7 +69,7 @@ library
6869 -- Bundled with GHC: Lower bound to not force re-installs
6970 -- text and mtl are bundled starting with GHC-8.4
7071 build-depends:
71− base >= 4.9 && < 4.13
72+ base >= 4.9 && < 4.14
7273 , bytestring >= 0.10.8.1 && < 0.11
7374 , containers >= 0.5.7.1 && < 0.7
7475 , mtl >= 2.2.2 && < 2.3
@@ -85,7 +86,7 @@ library
8586 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8687 -- Here can be exceptions if we really need features from the newer versions.
8788 build-depends:
88− base-compat >= 0.10.5 && < 0.11
89+ base-compat >= 0.10.5 && < 0.12
8990 , base64-bytestring >= 1.0.0.1 && < 1.1
9091 , exceptions >= 0.10.0 && < 0.11
9192 , http-media >= 0.7.1.3 && < 0.9
servant/servant.cabal+3−2
@@ -25,6 +25,7 @@ tested-with:
2525 || ==8.2.2
2626 || ==8.4.4
2727 || ==8.6.5
28+ || ==8.8.1
2829 , GHCJS == 8.4
2930
3031extra-source-files:
@@ -89,7 +90,7 @@ library
8990 --
9091 -- note: mtl lower bound is so low because of GHC-7.8
9192 build-depends:
92− base >= 4.9 && < 4.13
93+ base >= 4.9 && < 4.14
9394 , bytestring >= 0.10.8.1 && < 0.11
9495 , mtl >= 2.2.2 && < 2.3
9596 , transformers >= 0.5.2.0 && < 0.6
@@ -105,7 +106,7 @@ library
105106 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
106107 -- Here can be exceptions if we really need features from the newer versions.
107108 build-depends:
108− base-compat >= 0.10.5 && < 0.11
109+ base-compat >= 0.10.5 && < 0.12
109110 , aeson >= 1.4.1.0 && < 1.5
110111 , attoparsec >= 0.13.2.2 && < 0.14
111112 , bifunctors >= 5.5.3 && < 5.6