git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1245 from haskell-servant/small-updates

Small updates

commit971d14032a40eef853c9678fee2f4400b7dbe558 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 18 Nov 2019, 00:57 (7 years ago) parentcc7dc4083336ae
4 files changed+10−9
compare with master
unifiedsplit
.travis.yml+7−7 cabal.haskell-ci+1 doc/tutorial/tutorial.cabal+1−1 servant-jsaddle/servant-jsaddle.cabal+1−1
.travis.yml+7−7
@@ -7,7 +7,7 @@
77# version: 0.7.20191106
88#
99language: c
10−dist: xenial
10+dist: bionic
1111git:
1212 # whether to recursively clone submodules
1313 submodules: false
@@ -33,17 +33,17 @@ before_cache:
3333matrix:
3434 include:
3535 - compiler: ghcjs-8.4
36− addons: {"apt":{"sources":["hvr-ghc",{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu xenial main"},{"sourceline":"deb https://deb.nodesource.com/node_8.x xenial main","key_url":"https://deb.nodesource.com/gpgkey/nodesource.gpg.key"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}
36+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"},{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu bionic main"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}
3737 - compiler: ghc-8.8.1
38− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
38+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
3939 - compiler: ghc-8.6.5
40− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
4141 - compiler: ghc-8.4.4
42− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
42+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
4343 - compiler: ghc-8.2.2
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
44+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
4545 - compiler: ghc-8.0.2
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
4747before_install:
4848 - |
4949 if echo $CC | grep -q ghcjs; then
cabal.haskell-ci+1
@@ -1,3 +1,4 @@
1+distribution: bionic
12folds: all-but-test
23branches: master
34jobs-selection: any
doc/tutorial/tutorial.cabal+1−1
@@ -66,7 +66,7 @@ library
6666 blaze-html >= 0.9.0.1 && < 0.10
6767 , blaze-markup >= 0.8.0.0 && < 0.9
6868 , cookie >= 0.4.3 && < 0.5
69− , js-jquery >= 3.2.1 && < 3.3
69+ , js-jquery >= 3.3.1 && < 3.4
7070 , lucid >= 2.9.11 && < 2.10
7171 , random >= 1.1 && < 1.2
7272 , servant-js >= 0.9 && < 0.10
servant-jsaddle/servant-jsaddle.cabal+1−1
@@ -122,4 +122,4 @@ test-suite spec
122122 , jsaddle-warp
123123 , QuickCheck
124124
125− build-tool-depends: hspec-discover:hspec-discover >=2.4.4 && <2.5
125+ build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8