From ae94e0ea2b28ea13bd05e9e0ab50ca7c877d4540 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 28 May 2019 15:27:52 +0300 Subject: [PATCH] Allow newer network, semigroups, hashable, machines --- .travis.yml | 21 ++++++++++++++----- cabal.project | 13 +++++++++++- servant-client/servant-client.cabal | 2 +- servant-docs/servant-docs.cabal | 2 +- .../servant-http-streams.cabal | 2 +- servant-machines/servant-machines.cabal | 2 +- servant-server/servant-server.cabal | 2 +- 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e86e067..342b2745 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.3.20190413 +# version: 0.3.20190521 # language: c dist: xenial @@ -83,6 +83,7 @@ install: echo "world-file: $CABALHOME/world" >> $CABALHOME/config echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config + echo "installdir: $CABALHOME/bin" >> $CABALHOME/config echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config echo "store-dir: $CABALHOME/store" >> $CABALHOME/config echo "install-dirs user" >> $CABALHOME/config @@ -131,10 +132,15 @@ install: echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project echo "allow-newer: servant-quickcheck:hspec" >> cabal.project echo "allow-newer: servant-quickcheck:http-client" >> cabal.project - echo "allow-newer: http-media" >> 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: openssl-streams-1.2.2.0:network" >> cabal.project echo "optimization: False" >> cabal.project echo "write-ghc-environment-files: always" >> 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-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-machines|servant-pipes|servant-server|tutorial)$' | 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-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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi @@ -211,10 +217,15 @@ script: echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project echo "allow-newer: servant-quickcheck:hspec" >> cabal.project echo "allow-newer: servant-quickcheck:http-client" >> cabal.project - echo "allow-newer: http-media" >> 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: openssl-streams-1.2.2.0:network" >> cabal.project echo "optimization: False" >> cabal.project echo "write-ghc-environment-files: always" >> 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-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-machines|servant-pipes|servant-server|tutorial)$' | 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-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-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - echo -en 'travis_fold:end:unpack\\r' diff --git a/cabal.project b/cabal.project index 171185ca..0a81685c 100644 --- a/cabal.project +++ b/cabal.project @@ -52,4 +52,15 @@ allow-newer: servant-quickcheck:hspec, servant-quickcheck:http-client -allow-newer: http-media +-- constraints: semigroups ^>=0.19 +-- constraints: hashable ^>=1.3 +-- constraints: network ^>=3.1 +-- constraints: machines ^>=0.7 +-- constraints: http-media ^>=0.8 + +allow-newer: vault-0.3.1.2:hashable +allow-newer: psqueues-0.2.7.1:hashable +allow-newer: sqlite-simple-0.4.16.0:semigroups +allow-newer: direct-sqlite-2.3.24:semigroups +allow-newer: io-streams-1.5.1.0:network +allow-newer: openssl-streams-1.2.2.0:network diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index b17f3211..75a1dc6c 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -118,7 +118,7 @@ test-suite spec entropy >= 0.4.1.3 && < 0.5 , hspec >= 2.6.0 && < 2.8 , HUnit >= 1.6.0.0 && < 1.7 - , network >= 2.8.0.0 && < 3.1 + , network >= 2.8.0.0 && < 3.2 , QuickCheck >= 2.12.6.1 && < 2.14 , servant == 0.16.* , servant-server == 0.16.* diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 16a78be6..e3b85bba 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -62,7 +62,7 @@ library , base-compat >= 0.10.5 && < 0.11 , case-insensitive >= 1.2.0.11 && < 1.3 , control-monad-omega >= 0.3.1 && < 0.4 - , hashable >= 1.2.7.0 && < 1.3 + , hashable >= 1.2.7.0 && < 1.4 , http-media >= 0.7.1.3 && < 0.9 , http-types >= 0.12.2 && < 0.13 , lens >= 4.17 && < 4.18 diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal index 643d8bb1..b7ddf7a7 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -119,7 +119,7 @@ test-suite spec entropy >= 0.4.1.3 && < 0.5 , hspec >= 2.6.0 && < 2.8 , HUnit >= 1.6.0.0 && < 1.7 - , network >= 2.8.0.0 && < 3.1 + , network >= 2.8.0.0 && < 3.2 , QuickCheck >= 2.12.6.1 && < 2.14 , servant == 0.16.* , servant-server == 0.16.* diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index 2d09ba48..9a5ca435 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -35,7 +35,7 @@ library build-depends: base >=4.9 && <5 , bytestring >=0.10.8.1 && <0.11 - , machines >=0.6.4 && <0.7 + , machines >=0.6.4 && <0.8 , mtl >=2.2.2 && <2.3 , servant >=0.15 && <0.17 hs-source-dirs: src diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 89cf4ee8..f7744a5f 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -93,7 +93,7 @@ library , http-types >= 0.12.2 && < 0.13 , network-uri >= 2.6.1.0 && < 2.8 , monad-control >= 1.0.2.3 && < 1.1 - , network >= 2.8 && < 3.1 + , network >= 2.8 && < 3.2 , string-conversions >= 0.4.0.1 && < 0.5 , resourcet >= 1.2.2 && < 1.3 , tagged >= 0.8.6 && < 0.9