git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1269 from haskell-servant/drop-allow-newer

Drop most allow-newer in cabal.project

commit5998429e8178c9e9cc58ec3cfdc4d92e0e9c2400 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 24 Jan 2020, 13:17 (7 years ago) parentc15f5507916051
2 files changed+23−47
.travis.yml+16−32 cabal.project+7−15
.travis.yml+16−32
@@ -137,22 +137,14 @@ install:
137137 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi
138138 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi
139139 - |
140− echo "constraints: foundation >=0.0.14" >> cabal.project
141− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
142− echo "constraints: sqlite-simple < 0" >> cabal.project
143− echo "constraints: base-compat ^>=0.11" >> cabal.project
144− echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
145− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
146− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
147− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
148− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
149− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
150− echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
151− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
152− echo "allow-newer: servant" >> cabal.project
153− echo "allow-newer: servant-server" >> cabal.project
154− echo "allow-newer: servant-client" >> cabal.project
155− echo "optimization: False" >> cabal.project
140+ echo "constraints: foundation >=0.0.14" >> cabal.project
141+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
142+ echo "constraints: base-compat ^>=0.11" >> cabal.project
143+ echo "constraints: semigroups ^>=0.19" >> cabal.project
144+ echo "constraints: sqlite-simple < 0" >> cabal.project
145+ echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project
146+ echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project
147+ echo "optimization: False" >> cabal.project
156148 - "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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
157149 - cat cabal.project || true
158150 - cat cabal.project.local || true
@@ -242,22 +234,14 @@ script:
242234 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi
243235 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi
244236 - |
245− echo "constraints: foundation >=0.0.14" >> cabal.project
246− echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
247− echo "constraints: sqlite-simple < 0" >> cabal.project
248− echo "constraints: base-compat ^>=0.11" >> cabal.project
249− echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
250− echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
251− echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
252− echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
253− echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
254− echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
255− echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
256− echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
257− echo "allow-newer: servant" >> cabal.project
258− echo "allow-newer: servant-server" >> cabal.project
259− echo "allow-newer: servant-client" >> cabal.project
260− echo "optimization: False" >> cabal.project
237+ echo "constraints: foundation >=0.0.14" >> cabal.project
238+ echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
239+ echo "constraints: base-compat ^>=0.11" >> cabal.project
240+ echo "constraints: semigroups ^>=0.19" >> cabal.project
241+ echo "constraints: sqlite-simple < 0" >> cabal.project
242+ echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project
243+ echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project
244+ echo "optimization: False" >> cabal.project
261245 - "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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
262246 - cat cabal.project || true
263247 - cat cabal.project.local || true
cabal.project+7−15
@@ -47,26 +47,18 @@ constraints:
4747 foundation >=0.0.14,
4848 memory <0.14.12 || >0.14.12
4949
50−allow-newer: aeson-pretty-0.8.7:base-compat
51−
52−allow-newer: vault-0.3.1.2:hashable
53−allow-newer: psqueues-0.2.7.1:hashable
54−allow-newer: sqlite-simple-0.4.16.0:semigroups
55−allow-newer: direct-sqlite-2.3.24:semigroups
56−allow-newer: io-streams-1.5.1.0:network
57−allow-newer: io-streams-1.5.1.0:primitive
58−allow-newer: openssl-streams-1.2.2.0:network
50+constraints: base-compat ^>=0.11
51+constraints: semigroups ^>=0.19
5952
6053-- MonadFail
6154-- https://github.com/nurpax/sqlite-simple/issues/74
6255constraints: sqlite-simple < 0
63−
64−constraints: base-compat ^>=0.11
56+-- allow-newer: sqlite-simple-0.4.16.0:semigroups
57+-- allow-newer: direct-sqlite-2.3.24:semigroups
6558
6659-- needed for doctests
6760write-ghc-environment-files: always
6861
69−-- servant-0.17
70−allow-newer: servant
71−allow-newer: servant-server
72−allow-newer: servant-client
62+-- https://github.com/chordify/haskell-servant-pagination/pull/12
63+allow-newer: servant-pagination-2.2.2:servant
64+allow-newer: servant-pagination-2.2.2:servant-server