eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1222 from haskell-servant/less-allow-newer

Browse source 
Less allow-newer
This commit is contained in:
Oleg Grenrus 2019-09-18 14:48:06 +03:00 committed by GitHub
commit 135d993ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
.travis.yml
View file

@ -128,34 +128,18 @@ install:
if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi
if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi
- | - |
echo "constraints: foundation >=0.0.14" >> cabal.project echo "constraints: foundation >=0.0.14" >> cabal.project
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
echo "constraints: sqlite-simple < 0" >> cabal.project echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: servant-multipart-0.11.4:http-media" >> cabal.project echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: servant-multipart-0.11.4:lens" >> cabal.project echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: servant-js-0.9.4:base" >> cabal.project echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: servant-js-0.9.4:base-compat" >> cabal.project echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: servant-js-0.9.4:lens" >> cabal.project echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:base" >> cabal.project echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:base-compat-batteries" >> cabal.project echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:hspec" >> cabal.project echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:http-client" >> cabal.project echo "optimization: False" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:http-media" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:QuickCheck" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant-client" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant-server" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:time" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:warp" >> cabal.project
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "optimization: False" >> cabal.project
- "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" - "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"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true
@ -239,34 +223,18 @@ script:
if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi
if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi
- | - |
echo "constraints: foundation >=0.0.14" >> cabal.project echo "constraints: foundation >=0.0.14" >> cabal.project
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
echo "constraints: sqlite-simple < 0" >> cabal.project echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: servant-multipart-0.11.4:http-media" >> cabal.project echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: servant-multipart-0.11.4:lens" >> cabal.project echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: servant-js-0.9.4:base" >> cabal.project echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: servant-js-0.9.4:base-compat" >> cabal.project echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: servant-js-0.9.4:lens" >> cabal.project echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:base" >> cabal.project echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:base-compat-batteries" >> cabal.project echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:hspec" >> cabal.project echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:http-client" >> cabal.project echo "optimization: False" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:http-media" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:QuickCheck" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant-client" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:servant-server" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:time" >> cabal.project
echo "allow-newer: servant-quickcheck-0.0.7.4:warp" >> cabal.project
echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project
echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project
echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
echo "optimization: False" >> cabal.project
- "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" - "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"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true

29
cabal.project
View file

@ -40,35 +40,6 @@ constraints:
foundation >=0.0.14, foundation >=0.0.14,
memory <0.14.12 || >0.14.12 memory <0.14.12 || >0.14.12
allow-newer:
servant-multipart-0.11.4:http-media,
servant-multipart-0.11.4:lens
allow-newer:
servant-js-0.9.4:base,
servant-js-0.9.4:base-compat,
servant-js-0.9.4:lens
allow-newer:
-- servant-pagination:servant, servant-pagination:servant-server,
-- servant-multipart:servant, servant-multipart:servant-server,
-- servant-auth-server:servant, servant-auth-server:servant-server,
-- servant-js:servant, servant-js:servant-foreign
-- servant-quickcheck
allow-newer:
servant-quickcheck-0.0.7.4:base,
servant-quickcheck-0.0.7.4:base-compat-batteries,
servant-quickcheck-0.0.7.4:hspec,
servant-quickcheck-0.0.7.4:http-client,
servant-quickcheck-0.0.7.4:http-media,
servant-quickcheck-0.0.7.4:QuickCheck,
servant-quickcheck-0.0.7.4:servant,
servant-quickcheck-0.0.7.4:servant-client,
servant-quickcheck-0.0.7.4:servant-server,
servant-quickcheck-0.0.7.4:time,
servant-quickcheck-0.0.7.4:warp
allow-newer: aeson-pretty-0.8.7:base-compat allow-newer: aeson-pretty-0.8.7:base-compat
allow-newer: vault-0.3.1.2:hashable allow-newer: vault-0.3.1.2:hashable