git.iko.soy/typeable/servant
on master help sign in
Allow newer network, semigroups, hashable, machines
commitae94e0ea2b28ea13bd05e9e0ab50ca7c877d4540 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 28 May 2019, 15:27 (7 years ago) parent002b096
7 files changed+33−11
compare with master
unifiedsplit
.travis.yml+16−5 cabal.project+12−1 servant-client/servant-client.cabal+1−1 servant-docs/servant-docs.cabal+1−1 servant-http-streams/servant-http-streams.cabal+1−1 servant-machines/servant-machines.cabal+1−1 servant-server/servant-server.cabal+1−1
.travis.yml+16−5
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.3.20190413
7+# version: 0.3.20190521
88#
99language: c
1010dist: xenial
@@ -83,6 +83,7 @@ install:
8383 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
8484 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
8585 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
86+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
8687 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
8788 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
8889 echo "install-dirs user" >> $CABALHOME/config
@@ -131,10 +132,15 @@ install:
131132 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
132133 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
133134 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134− echo "allow-newer: http-media" >> cabal.project
135+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
136+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
137+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
138+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
139+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
140+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
135141 echo "optimization: False" >> cabal.project
136142 echo "write-ghc-environment-files: always" >> cabal.project
137− - "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"
143+ - "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"
138144 - cat cabal.project || true
139145 - cat cabal.project.local || true
140146 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -211,10 +217,15 @@ script:
211217 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
212218 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
213219 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
214− echo "allow-newer: http-media" >> cabal.project
220+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
221+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
222+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
223+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
224+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
225+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
215226 echo "optimization: False" >> cabal.project
216227 echo "write-ghc-environment-files: always" >> cabal.project
217− - "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"
228+ - "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"
218229 - cat cabal.project || true
219230 - cat cabal.project.local || true
220231 - echo -en 'travis_fold:end:unpack\\r'
cabal.project+12−1
@@ -52,4 +52,15 @@ allow-newer:
5252 servant-quickcheck:hspec,
5353 servant-quickcheck:http-client
5454
55−allow-newer: http-media
55+-- constraints: semigroups ^>=0.19
56+-- constraints: hashable ^>=1.3
57+-- constraints: network ^>=3.1
58+-- constraints: machines ^>=0.7
59+-- constraints: http-media ^>=0.8
60+
61+allow-newer: vault-0.3.1.2:hashable
62+allow-newer: psqueues-0.2.7.1:hashable
63+allow-newer: sqlite-simple-0.4.16.0:semigroups
64+allow-newer: direct-sqlite-2.3.24:semigroups
65+allow-newer: io-streams-1.5.1.0:network
66+allow-newer: openssl-streams-1.2.2.0:network
servant-client/servant-client.cabal+1−1
@@ -118,7 +118,7 @@ test-suite spec
118118 entropy >= 0.4.1.3 && < 0.5
119119 , hspec >= 2.6.0 && < 2.8
120120 , HUnit >= 1.6.0.0 && < 1.7
121− , network >= 2.8.0.0 && < 3.1
121+ , network >= 2.8.0.0 && < 3.2
122122 , QuickCheck >= 2.12.6.1 && < 2.14
123123 , servant == 0.16.*
124124 , servant-server == 0.16.*
servant-docs/servant-docs.cabal+1−1
@@ -62,7 +62,7 @@ library
6262 , base-compat >= 0.10.5 && < 0.11
6363 , case-insensitive >= 1.2.0.11 && < 1.3
6464 , control-monad-omega >= 0.3.1 && < 0.4
65− , hashable >= 1.2.7.0 && < 1.3
65+ , hashable >= 1.2.7.0 && < 1.4
6666 , http-media >= 0.7.1.3 && < 0.9
6767 , http-types >= 0.12.2 && < 0.13
6868 , lens >= 4.17 && < 4.18
servant-http-streams/servant-http-streams.cabal+1−1
@@ -119,7 +119,7 @@ test-suite spec
119119 entropy >= 0.4.1.3 && < 0.5
120120 , hspec >= 2.6.0 && < 2.8
121121 , HUnit >= 1.6.0.0 && < 1.7
122− , network >= 2.8.0.0 && < 3.1
122+ , network >= 2.8.0.0 && < 3.2
123123 , QuickCheck >= 2.12.6.1 && < 2.14
124124 , servant == 0.16.*
125125 , servant-server == 0.16.*
servant-machines/servant-machines.cabal+1−1
@@ -35,7 +35,7 @@ library
3535 build-depends:
3636 base >=4.9 && <5
3737 , bytestring >=0.10.8.1 && <0.11
38− , machines >=0.6.4 && <0.7
38+ , machines >=0.6.4 && <0.8
3939 , mtl >=2.2.2 && <2.3
4040 , servant >=0.15 && <0.17
4141 hs-source-dirs: src
servant-server/servant-server.cabal+1−1
@@ -93,7 +93,7 @@ library
9393 , http-types >= 0.12.2 && < 0.13
9494 , network-uri >= 2.6.1.0 && < 2.8
9595 , monad-control >= 1.0.2.3 && < 1.1
96− , network >= 2.8 && < 3.1
96+ , network >= 2.8 && < 3.2
9797 , string-conversions >= 0.4.0.1 && < 0.5
9898 , resourcet >= 1.2.2 && < 1.3
9999 , tagged >= 0.8.6 && < 0.9