Skip to content

Commit 6120385

Browse files
committed
Allow newer network, semigroups, hashable, machines
1 parent fffb513 commit 6120385

File tree

7 files changed

+29
-5
lines changed

7 files changed

+29
-5
lines changed

.travis.yml

+12
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@ install:
131131
echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
132132
echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
133133
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
134140
echo "optimization: False" >> cabal.project
135141
echo "write-ghc-environment-files: always" >> cabal.project
136142
- "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:
210216
echo "allow-newer: servant-quickcheck:servant-server" >> cabal.project
211217
echo "allow-newer: servant-quickcheck:hspec" >> cabal.project
212218
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
213225
echo "optimization: False" >> cabal.project
214226
echo "write-ghc-environment-files: always" >> cabal.project
215227
- "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
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,15 @@ allow-newer:
5252
servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
5353
servant-quickcheck:hspec,
5454
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
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ test-suite spec
124124
entropy >= 0.4.1.3 && < 0.5
125125
, hspec >= 2.6.0 && < 2.8
126126
, HUnit >= 1.6.0.0 && < 1.7
127-
, network >= 2.8.0.0 && < 3.1
127+
, network >= 2.8.0.0 && < 3.2
128128
, QuickCheck >= 2.12.6.1 && < 2.14
129129
, servant == 0.16.*
130130
, servant-server == 0.16.*

servant-docs/servant-docs.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -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
Original file line numberDiff line numberDiff line change
@@ -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-machines/servant-machines.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -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
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ library
9292
, http-types >= 0.12.2 && < 0.13
9393
, network-uri >= 2.6.1.0 && < 2.8
9494
, monad-control >= 1.0.2.3 && < 1.1
95-
, network >= 2.8 && < 3.1
95+
, network >= 2.8 && < 3.2
9696
, string-conversions >= 0.4.0.1 && < 0.5
9797
, resourcet >= 1.2.2 && < 1.3
9898
, tagged >= 0.8.6 && < 0.9

0 commit comments

Comments
 (0)