git.iko.soy/typeable/servant
on master help sign in
Re-organise cabal.project (for GHC-8.8)
1dbd258Oleg Grenrus
.travis.yml+24
compare with master
unifiedsplit
@@ -158,19 +158,31 @@ install:
158 - |
158 - |
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+<<<<<<< HEAD
161 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
162 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
162 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
163 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
163 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
164 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
164 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
165 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
165 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
166 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
166 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
171 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
167 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
172 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
168 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
173 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
169 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
174 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
170 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
175 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
176+<<<<<<< HEAD
171 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
177 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
172 echo "optimization: False" >> cabal.project
178 echo "optimization: False" >> cabal.project
173 - "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"
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+=======
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
174 - cat cabal.project || true
186 - cat cabal.project || true
175 - cat cabal.project.local || true
187 - cat cabal.project.local || true
176 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
188 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -270,19 +282,31 @@ script:
270 - |
282 - |
271 echo "constraints: foundation >=0.0.14" >> cabal.project
283 echo "constraints: foundation >=0.0.14" >> cabal.project
272 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
284 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
285+<<<<<<< HEAD
273 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
286 echo "allow-newer: servant-quickcheck:servant" >> cabal.project
274 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
287 echo "allow-newer: servant-quickcheck:servant-client" >> cabal.project
275 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
288 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
276 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
289 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
277 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
290 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
278 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
295 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
279 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
296 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
280 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
297 echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
281 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
298 echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
282 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
299 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
300+<<<<<<< HEAD
283 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
301 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
284 echo "optimization: False" >> cabal.project
302 echo "optimization: False" >> cabal.project
285 - "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"
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+=======
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
286 - cat cabal.project || true
310 - cat cabal.project || true
287 - cat cabal.project.local || true
311 - cat cabal.project.local || true
288 - echo -en 'travis_fold:end:unpack\\r'
312 - echo -en 'travis_fold:end:unpack\\r'
cabal.project+9−18
@@ -1,7 +1,6 @@
1packages:
1packages:
2 servant/
2 servant/
3 servant-client/
3 servant-client/
4− servant-jsaddle/
5 servant-client-core/
4 servant-client-core/
6 servant-http-streams/
5 servant-http-streams/
7 servant-docs/
6 servant-docs/
@@ -9,12 +8,18 @@ packages:
9 servant-server/
8 servant-server/
10 doc/tutorial/
9 doc/tutorial/
11
10
11+-- servant streaming
12+packages:
12 servant-machines/
13 servant-machines/
13 servant-conduit/
14 servant-conduit/
14 servant-pipes/
15 servant-pipes/
15
16
16− -- doc/cookbook/*/*.cabal
17+-- servant GHCJS
18+packages:
19+-- servant-jsaddle/
17
20
21+-- Cookbooks
22+packages:
18 doc/cookbook/basic-auth
23 doc/cookbook/basic-auth
19 doc/cookbook/curl-mock
24 doc/cookbook/curl-mock
20 doc/cookbook/basic-streaming
25 doc/cookbook/basic-streaming
@@ -44,26 +49,12 @@ constraints:
44 foundation >=0.0.14,
49 foundation >=0.0.14,
45 memory <0.14.12 || >0.14.12
50 memory <0.14.12 || >0.14.12
46
51
47−allow-newer:
52+allow-newer: aeson-pretty-0.8.7:base-compat
48−-- servant-pagination:servant, servant-pagination:servant-server,
49−-- servant-multipart:servant, servant-multipart:servant-server,
50−-- servant-auth-server:servant, servant-auth-server:servant-server,
51−-- servant-js:servant, servant-js:servant-foreign
52−
53−-- servant-quickcheck
54−allow-newer:
55− servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
56− servant-quickcheck:hspec,
57− servant-quickcheck:http-client
58−
59−-- constraints: semigroups ^>=0.19
60−-- constraints: hashable ^>=1.3
61−-- constraints: network ^>=3.1
62−-- constraints: machines ^>=0.7
63
53
64allow-newer: vault-0.3.1.2:hashable
54allow-newer: vault-0.3.1.2:hashable
65allow-newer: psqueues-0.2.7.1:hashable
55allow-newer: psqueues-0.2.7.1:hashable
66allow-newer: sqlite-simple-0.4.16.0:semigroups
56allow-newer: sqlite-simple-0.4.16.0:semigroups
67allow-newer: direct-sqlite-2.3.24:semigroups
57allow-newer: direct-sqlite-2.3.24:semigroups
68allow-newer: io-streams-1.5.1.0:network
58allow-newer: io-streams-1.5.1.0:network
59+allow-newer: io-streams-1.5.1.0:primitive
69allow-newer: openssl-streams-1.2.2.0:network
60allow-newer: openssl-streams-1.2.2.0:network