git.iko.soy/typeable/servant
on master help sign in
Merge pull request #1183 from haskell-servant/allow-newer-stuff
4bd2aa1Oleg Grenrus
.travis.yml+12
compare with master
unifiedsplit
@@ -131,6 +131,12 @@ install:
131 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
131 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
132 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
132 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
133 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
133 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
135+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
136+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
137+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
138+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
139+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
134 echo "optimization: False" >> cabal.project
140 echo "optimization: False" >> cabal.project
135 echo "write-ghc-environment-files: always" >> cabal.project
141 echo "write-ghc-environment-files: always" >> cabal.project
136 - "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"
142 - "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"
@@ -210,6 +216,12 @@ script:
210 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
216 echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
211 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
217 echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
212 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
218 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
219+ echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project
220+ echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project
221+ echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project
222+ echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project
223+ echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project
224+ echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project
213 echo "optimization: False" >> cabal.project
225 echo "optimization: False" >> cabal.project
214 echo "write-ghc-environment-files: always" >> cabal.project
226 echo "write-ghc-environment-files: always" >> cabal.project
215 - "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"
227 - "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"
cabal.project+12
@@ -52,3 +52,15 @@ allow-newer:
52 servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
52 servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
53 servant-quickcheck:hspec,
53 servant-quickcheck:hspec,
54 servant-quickcheck:http-client
54 servant-quickcheck:http-client
55+
56+-- constraints: semigroups ^>=0.19
57+-- constraints: hashable ^>=1.3
58+-- constraints: network ^>=3.1
59+-- constraints: machines ^>=0.7
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
@@ -124,7 +124,7 @@ test-suite spec
124 entropy >= 0.4.1.3 && < 0.5
124 entropy >= 0.4.1.3 && < 0.5
125 , hspec >= 2.6.0 && < 2.8
125 , hspec >= 2.6.0 && < 2.8
126 , HUnit >= 1.6.0.0 && < 1.7
126 , HUnit >= 1.6.0.0 && < 1.7
127− , network >= 2.8.0.0 && < 3.1
127+ , network >= 2.8.0.0 && < 3.2
128 , QuickCheck >= 2.12.6.1 && < 2.14
128 , QuickCheck >= 2.12.6.1 && < 2.14
129 , servant == 0.16.*
129 , servant == 0.16.*
130 , servant-server == 0.16.*
130 , servant-server == 0.16.*
servant-docs/servant-docs.cabal+1−1
@@ -62,7 +62,7 @@ library
62 , base-compat >= 0.10.5 && < 0.11
62 , base-compat >= 0.10.5 && < 0.11
63 , case-insensitive >= 1.2.0.11 && < 1.3
63 , case-insensitive >= 1.2.0.11 && < 1.3
64 , control-monad-omega >= 0.3.1 && < 0.4
64 , control-monad-omega >= 0.3.1 && < 0.4
65− , hashable >= 1.2.7.0 && < 1.3
65+ , hashable >= 1.2.7.0 && < 1.4
66 , http-media >= 0.7.1.3 && < 0.9
66 , http-media >= 0.7.1.3 && < 0.9
67 , http-types >= 0.12.2 && < 0.13
67 , http-types >= 0.12.2 && < 0.13
68 , lens >= 4.17 && < 4.18
68 , lens >= 4.17 && < 4.18
servant-http-streams/servant-http-streams.cabal+1−1
@@ -118,7 +118,7 @@ test-suite spec
118 entropy >= 0.4.1.3 && < 0.5
118 entropy >= 0.4.1.3 && < 0.5
119 , hspec >= 2.6.0 && < 2.8
119 , hspec >= 2.6.0 && < 2.8
120 , HUnit >= 1.6.0.0 && < 1.7
120 , HUnit >= 1.6.0.0 && < 1.7
121− , network >= 2.8.0.0 && < 3.1
121+ , network >= 2.8.0.0 && < 3.2
122 , QuickCheck >= 2.12.6.1 && < 2.14
122 , QuickCheck >= 2.12.6.1 && < 2.14
123 , servant == 0.16.*
123 , servant == 0.16.*
124 , servant-server == 0.16.*
124 , servant-server == 0.16.*
servant-machines/servant-machines.cabal+1−1
@@ -35,7 +35,7 @@ library
35 build-depends:
35 build-depends:
36 base >=4.9 && <5
36 base >=4.9 && <5
37 , bytestring >=0.10.8.1 && <0.11
37 , bytestring >=0.10.8.1 && <0.11
38− , machines >=0.6.4 && <0.7
38+ , machines >=0.6.4 && <0.8
39 , mtl >=2.2.2 && <2.3
39 , mtl >=2.2.2 && <2.3
40 , servant >=0.15 && <0.17
40 , servant >=0.15 && <0.17
41 hs-source-dirs: src
41 hs-source-dirs: src
servant-server/servant-server.cabal+1−1
@@ -92,7 +92,7 @@ library
92 , http-types >= 0.12.2 && < 0.13
92 , http-types >= 0.12.2 && < 0.13
93 , network-uri >= 2.6.1.0 && < 2.8
93 , network-uri >= 2.6.1.0 && < 2.8
94 , monad-control >= 1.0.2.3 && < 1.1
94 , monad-control >= 1.0.2.3 && < 1.1
95− , network >= 2.8 && < 3.1
95+ , network >= 2.8 && < 3.2
96 , string-conversions >= 0.4.0.1 && < 0.5
96 , string-conversions >= 0.4.0.1 && < 0.5
97 , resourcet >= 1.2.2 && < 1.3
97 , resourcet >= 1.2.2 && < 1.3
98 , tagged >= 0.8.6 && < 0.9
98 , tagged >= 0.8.6 && < 0.9