@@ -158,19 +158,31 @@ 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
161162 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
162163 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
163164 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
164165 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
165166 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
167+=======
168+ echo "constraints: sqlite-simple < 0" >> cabal.project
169+ echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
170+>>>>>>> 8ed0e9e2... Less allow-newer
166171 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
167172 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
168173 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
169174 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
170175 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
176+<<<<<<< HEAD
171177 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
172178 echo "optimization: False" >> cabal.project
173179 - "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+=======
181+ echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
182+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
183+ 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
174186 - cat cabal.project || true
175187 - cat cabal.project.local || true
176188 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -270,19 +282,31 @@ script:
270282 - |
271283 echo "constraints: foundation >=0.0.14" >> cabal.project
272284 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
285+<<<<<<< HEAD
273286 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
274287 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
275288 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
276289 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
277290 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
291+=======
292+ echo "constraints: sqlite-simple < 0" >> cabal.project
293+ echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
294+>>>>>>> 8ed0e9e2... Less allow-newer
278295 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
279296 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
280297 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
281298 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
282299 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
300+<<<<<<< HEAD
283301 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
284302 echo "optimization: False" >> cabal.project
285303 - "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+=======
305+ echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
306+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
307+ 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
286310 - cat cabal.project || true
287311 - cat cabal.project.local || true
288312 - echo -en 'travis_fold:end:unpack\\r'