git.iko.soy/typeable/servant
on master help sign in
Build jsaddle with GHC-8.8
fa35b5bOleg Grenrus
.travis.yml+20−2
compare with master
unifiedsplit
@@ -143,7 +143,7 @@ install:
143 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
143 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi
144 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
144 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi
145 if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi
145 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
146+ echo "packages: servant-jsaddle" >> cabal.project
147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
149 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
149 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
@@ -159,6 +159,7 @@ install:
159 echo "constraints: foundation >=0.0.14" >> cabal.project
159 echo "constraints: foundation >=0.0.14" >> cabal.project
160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
161 echo "constraints: sqlite-simple < 0" >> cabal.project
161 echo "constraints: sqlite-simple < 0" >> cabal.project
162+ echo "constraints: base-compat ^>=0.11" >> cabal.project
162 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
163 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
163 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
164 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
164 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
165 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
@@ -167,6 +168,14 @@ install:
167 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
168 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
168 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
169 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
169 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
170 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
171+ echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project
172+ echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project
173+ echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project
174+ echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project
175+ echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project
176+ echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project
177+ echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project
178+ echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project
170 echo "optimization: False" >> cabal.project
179 echo "optimization: False" >> cabal.project
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"
180 - "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"
172 - cat cabal.project || true
181 - cat cabal.project || true
@@ -247,7 +256,7 @@ script:
247 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
256 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi
248 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
257 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi
249 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi
258 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
259+ echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project
251 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
260 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
252 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
261 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
253 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
262 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
@@ -263,6 +272,7 @@ script:
263 echo "constraints: foundation >=0.0.14" >> cabal.project
272 echo "constraints: foundation >=0.0.14" >> cabal.project
264 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
273 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
265 echo "constraints: sqlite-simple < 0" >> cabal.project
274 echo "constraints: sqlite-simple < 0" >> cabal.project
275+ echo "constraints: base-compat ^>=0.11" >> cabal.project
266 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
276 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
267 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
277 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
268 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
278 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
@@ -271,6 +281,14 @@ script:
271 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
281 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
272 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
282 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
273 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
283 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
284+ echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project
285+ echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project
286+ echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project
287+ echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project
288+ echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project
289+ echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project
290+ echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project
291+ echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project
274 echo "optimization: False" >> cabal.project
292 echo "optimization: False" >> cabal.project
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"
293 - "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"
276 - cat cabal.project || true
294 - cat cabal.project || true
cabal.project+12
@@ -62,3 +62,15 @@ allow-newer: openssl-streams-1.2.2.0:network
62-- MonadFail
62-- MonadFail
63-- https://github.com/nurpax/sqlite-simple/issues/74
63-- https://github.com/nurpax/sqlite-simple/issues/74
64constraints: sqlite-simple < 0
64constraints: sqlite-simple < 0
65+
66+-- jsaddle
67+allow-newer: jsaddle-0.9.6.0:lens
68+allow-newer: jsaddle-0.9.6.0:primitive
69+allow-newer: jsaddle-0.9.6.0:time
70+allow-newer: jsaddle-dom-0.9.3.2:base
71+allow-newer: jsaddle-dom-0.9.3.2:base-compat
72+allow-newer: jsaddle-dom-0.9.3.2:Cabal
73+allow-newer: jsaddle-dom-0.9.3.2:lens
74+allow-newer: jsaddle-warp-0.9.6.0:time
75+
76+constraints: base-compat ^>=0.11
servant-jsaddle/servant-jsaddle.cabal+4−4
@@ -22,7 +22,7 @@ category: Servant, Web
22build-type: Simple
22build-type: Simple
23cabal-version: >=1.10
23cabal-version: >=1.10
24tested-with:
24tested-with:
25− GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
25+ GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
26 , GHCJS ==8.4
26 , GHCJS ==8.4
27
27
28homepage: http://haskell-servant.readthedocs.org/
28homepage: http://haskell-servant.readthedocs.org/
@@ -46,7 +46,7 @@ library
46 -- Bundled with GHC: Lower bound to not force re-installs
46 -- Bundled with GHC: Lower bound to not force re-installs
47 -- text and mtl are bundled starting with GHC-8.4
47 -- text and mtl are bundled starting with GHC-8.4
48 build-depends:
48 build-depends:
49− base >=4.9 && <4.13
49+ base >=4.9 && <4.14
50 , bytestring >=0.10.8.1 && <0.11
50 , bytestring >=0.10.8.1 && <0.11
51 , containers >=0.5.7.1 && <0.7
51 , containers >=0.5.7.1 && <0.7
52 , mtl >=2.2.2 && <2.3
52 , mtl >=2.2.2 && <2.3
@@ -60,10 +60,10 @@ library
60 -- Strict dependency on `servant-client-core` as we re-export things.
60 -- Strict dependency on `servant-client-core` as we re-export things.
61 build-depends: servant-client-core >=0.16 && <0.16.1
61 build-depends: servant-client-core >=0.16 && <0.16.1
62 build-depends:
62 build-depends:
63− base-compat >=0.10.5 && <0.11
63+ base-compat >=0.10.5 && <0.12
64 , case-insensitive >=1.2.0.0 && <1.3
64 , case-insensitive >=1.2.0.0 && <1.3
65 , exceptions >=0.10.0 && <0.11
65 , exceptions >=0.10.0 && <0.11
66− , ghcjs-dom
66+ , ghcjs-dom >=0.9.4.0 && <0.10
67 , http-media >=0.7.1.3 && <0.9
67 , http-media >=0.7.1.3 && <0.9
68 , http-types >=0.12.2 && <0.13
68 , http-types >=0.12.2 && <0.13
69 , jsaddle >=0.9.6.0 && <0.10
69 , jsaddle >=0.9.6.0 && <0.10