Skip to content

Commit 0ba16f5

Browse files
committed
Sync up cabal metadata w/ metadata revision
cabal-install-2.4 doesn't build anymore w/ GHC 7.8 and older; so the metadata revision took care to fixup the lower bound of base and other boot libs to take the versions bundled w/ GHC 7.10.1 as the lower bounds. Moreover, this also fixes some upper bounds not being PVP compliant.
1 parent 88738ba commit 0ba16f5

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

cabal-install/cabal-install.cabal

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -297,31 +297,31 @@ executable cabal
297297
Paths_cabal_install
298298

299299
build-depends:
300-
async >= 2.0 && < 3,
300+
async >= 2.0 && < 2.3,
301301
array >= 0.4 && < 0.6,
302-
base >= 4.6 && < 5,
302+
base >= 4.8 && < 4.13,
303303
base16-bytestring >= 0.1.1 && < 0.2,
304-
binary >= 0.7 && < 0.9,
305-
bytestring >= 0.10.2 && < 1,
306-
Cabal == 2.4.*,
307-
containers >= 0.5 && < 0.7,
304+
binary >= 0.7.3 && < 0.9,
305+
bytestring >= 0.10.6.0 && < 0.11,
306+
Cabal >= 2.4.0.1 && < 2.5,
307+
containers >= 0.5.6.2 && < 0.7,
308308
cryptohash-sha256 >= 0.11 && < 0.12,
309-
deepseq >= 1.3 && < 1.5,
309+
deepseq >= 1.4.1.1 && < 1.5,
310310
directory >= 1.2.2.0 && < 1.4,
311311
echo >= 0.1.3 && < 0.2,
312312
edit-distance >= 0.2.2 && < 0.3,
313-
filepath >= 1.3 && < 1.5,
314-
hashable >= 1.0 && < 2,
313+
filepath >= 1.4.0.0 && < 1.5,
314+
hashable >= 1.0 && < 1.3,
315315
HTTP >= 4000.1.5 && < 4000.4,
316-
mtl >= 2.0 && < 3,
316+
mtl >= 2.0 && < 2.3,
317317
network-uri >= 2.6.0.2 && < 2.7,
318318
network >= 2.6 && < 2.8,
319319
pretty >= 1.1 && < 1.2,
320-
process >= 1.1.0.2 && < 1.7,
320+
process >= 1.2.3.0 && < 1.7,
321321
random >= 1 && < 1.2,
322-
stm >= 2.0 && < 3,
322+
stm >= 2.0 && < 2.6,
323323
tar >= 0.5.0.3 && < 0.6,
324-
time >= 1.4 && < 1.10,
324+
time >= 1.5.0.1 && < 1.10,
325325
zlib >= 0.5.3 && < 0.7,
326326
hackage-security >= 0.5.2.2 && < 0.6,
327327
text >= 1.2.3 && < 1.3,
@@ -337,7 +337,7 @@ executable cabal
337337
if os(windows)
338338
build-depends: Win32 >= 2 && < 3
339339
else
340-
build-depends: unix >= 2.5 && < 2.9
340+
build-depends: unix >= 2.5 && < 2.8
341341

342342
if flag(debug-expensive-assertions)
343343
cpp-options: -DDEBUG_EXPENSIVE_ASSERTIONS

cabal-install/cabal-install.cabal.pp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
#
1717
%def CABAL_BUILDDEPENDS
1818
build-depends:
19-
async >= 2.0 && < 3,
19+
async >= 2.0 && < 2.3,
2020
array >= 0.4 && < 0.6,
21-
base >= 4.6 && < 5,
21+
base >= 4.8 && < 4.13,
2222
base16-bytestring >= 0.1.1 && < 0.2,
23-
binary >= 0.7 && < 0.9,
24-
bytestring >= 0.10.2 && < 1,
25-
Cabal == 2.4.*,
26-
containers >= 0.5 && < 0.7,
23+
binary >= 0.7.3 && < 0.9,
24+
bytestring >= 0.10.6.0 && < 0.11,
25+
Cabal >= 2.4.0.1 && < 2.5,
26+
containers >= 0.5.6.2 && < 0.7,
2727
cryptohash-sha256 >= 0.11 && < 0.12,
28-
deepseq >= 1.3 && < 1.5,
28+
deepseq >= 1.4.1.1 && < 1.5,
2929
directory >= 1.2.2.0 && < 1.4,
3030
echo >= 0.1.3 && < 0.2,
3131
edit-distance >= 0.2.2 && < 0.3,
32-
filepath >= 1.3 && < 1.5,
33-
hashable >= 1.0 && < 2,
32+
filepath >= 1.4.0.0 && < 1.5,
33+
hashable >= 1.0 && < 1.3,
3434
HTTP >= 4000.1.5 && < 4000.4,
35-
mtl >= 2.0 && < 3,
35+
mtl >= 2.0 && < 2.3,
3636
network-uri >= 2.6.0.2 && < 2.7,
3737
network >= 2.6 && < 2.8,
3838
pretty >= 1.1 && < 1.2,
39-
process >= 1.1.0.2 && < 1.7,
39+
process >= 1.2.3.0 && < 1.7,
4040
random >= 1 && < 1.2,
41-
stm >= 2.0 && < 3,
41+
stm >= 2.0 && < 2.6,
4242
tar >= 0.5.0.3 && < 0.6,
43-
time >= 1.4 && < 1.10,
43+
time >= 1.5.0.1 && < 1.10,
4444
zlib >= 0.5.3 && < 0.7,
4545
hackage-security >= 0.5.2.2 && < 0.6,
4646
text >= 1.2.3 && < 1.3,
@@ -56,7 +56,7 @@
5656
if os(windows)
5757
build-depends: Win32 >= 2 && < 3
5858
else
59-
build-depends: unix >= 2.5 && < 2.9
59+
build-depends: unix >= 2.5 && < 2.8
6060
%enddef
6161
%def CABAL_COMPONENTCOMMON
6262
default-language: Haskell2010

0 commit comments

Comments
 (0)