Skip to content

Commit 4dcc2b6

Browse files
philderbeastphilderbeast
committed
Bounds covering ghc-8.4.4 and ghc-9.8.1
- Match ghc-8.4.4 included package lower bounds - Add cabal gen-bounds bounds
1 parent 1ef5ff2 commit 4dcc2b6

File tree

8 files changed

+59
-61
lines changed

8 files changed

+59
-61
lines changed

‎example-client/example-client.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ executable example-client
3636
other-modules: ExampleClient.Options
3737

3838
build-depends: base >= 4.11 && < 4.20,
39-
bytestring >= 0.9,
40-
directory >= 1.2,
41-
filepath >= 1.2,
42-
optparse-applicative >= 0.11,
43-
time >= 1.5,
39+
bytestring >= 0.10.8.2,
40+
directory >= 1.3.1.5,
41+
filepath >= 1.4.2,
42+
optparse-applicative >= 0.13,
43+
time >= 1.8.0.2,
4444
hackage-security >= 0.5,
4545
hackage-security-HTTP,
4646
hackage-security-curl,
@@ -65,5 +65,5 @@ executable example-client
6565
if flag(Cabal-syntax)
6666
build-depends: Cabal-syntax >= 3.7 && < 3.12
6767
else
68-
build-depends: Cabal >= 1.12 && < 3.7,
68+
build-depends: Cabal >= 2.2.0.1 && < 3.7,
6969
Cabal-syntax < 3.7

‎hackage-repo-tool/hackage-repo-tool.cabal‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ executable hackage-repo-tool
6060

6161
-- For boot libraries we try to accomodate the versions bundled with
6262
-- the respective GHC release
63-
build-depends: base >= 4.11 && < 4.20,
64-
bytestring >= 0.9 && < 0.13,
65-
directory >= 1.2 && < 1.4,
66-
filepath >= 1.3 && < 1.5,
67-
time >= 1.5 && < 1.13
63+
build-depends: base >= 4.11 && < 4.20,
64+
bytestring >= 0.10.8.2 && < 0.13,
65+
directory >= 1.3.1.5 && < 1.4,
66+
filepath >= 1.4.2 && < 1.5,
67+
time >= 1.8.0.2 && < 1.13
6868
if !os(windows)
69-
build-depends: unix >= 2.5 && < 2.9
69+
build-depends: unix >= 2.7.2.2 && < 2.9
7070

7171
-- For non-boot libraries we try to support single major versions
7272
-- to reduce the risk of semantic differences
7373
build-depends: microlens >= 0.4.11.2 && < 0.5,
74-
optparse-applicative >= 0.15.1 && < 0.18,
74+
optparse-applicative >= 0.13 && < 0.19,
7575
tar >= 0.5 && < 0.7,
7676
zlib >= 0.6 && < 0.8,
7777
hackage-security >= 0.6 && < 0.7
@@ -87,8 +87,7 @@ executable hackage-repo-tool
8787
if flag(Cabal-syntax)
8888
build-depends: Cabal-syntax >= 3.7 && < 3.12
8989
else
90-
build-depends: Cabal >= 1.14 && < 1.26
91-
|| >= 2.0 && < 2.6
90+
build-depends: Cabal >= 2.2.0.1 && < 2.6
9291
|| >= 3.0 && < 3.7,
9392
Cabal-syntax < 3.7
9493

‎hackage-root-tool/hackage-root-tool.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ source-repository head
3737
executable hackage-root-tool
3838
main-is: Main.hs
3939
build-depends: base >= 4.11 && < 5,
40-
filepath >= 1.2 && < 1.5,
41-
optparse-applicative >= 0.11 && < 0.18,
42-
hackage-security >= 0.5 && < 0.7
40+
filepath >= 1.4.2 && < 1.5,
41+
optparse-applicative >= 0.13 && < 0.19,
42+
hackage-security >= 0.5 && < 0.7
4343
default-language: Haskell2010
4444
other-extensions: CPP, ScopedTypeVariables, RecordWildCards
4545
ghc-options: -Wall

‎hackage-security-HTTP/hackage-security-HTTP.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ flag use-network-uri
4242
library
4343
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
4444
build-depends: base >= 4.11 && < 4.20,
45-
bytestring >= 0.9 && < 0.13,
45+
bytestring >= 0.10.8.2 && < 0.13,
4646
HTTP >= 4000.2.19 && < 4000.5,
47-
mtl >= 2.1 && < 2.4,
47+
mtl >= 2.2.2 && < 2.4,
4848
zlib >= 0.5 && < 0.8,
4949
hackage-security >= 0.5 && < 0.7
5050
hs-source-dirs: src

‎hackage-security-curl/hackage-security-curl.cabal‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ flag use-network-uri
3232

3333
library
3434
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
35-
build-depends: base >= 4.11 && < 4.20,
36-
bytestring >= 0.9,
37-
process >= 1.1,
38-
hackage-security
35+
build-depends: base >= 4.11 && < 4.20,
36+
bytestring >= 0.10.8.2 && < 0.13,
37+
process >= 1.6.3 && < 1.7,
38+
hackage-security >= 0.6.2 && < 0.7
3939
hs-source-dirs: src
4040
default-language: Haskell2010
4141
ghc-options: -Wall

‎hackage-security-http-client/hackage-security-http-client.cabal‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ copyright: Copyright 2015 Well-Typed LLP
1313
category: Distribution
1414
build-type: Simple
1515
cabal-version: >=1.10
16+
extra-source-files: ChangeLog.md
1617

1718
tested-with:
1819
GHC == 9.8.1
@@ -31,11 +32,11 @@ flag use-network-uri
3132

3233
library
3334
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
34-
build-depends: base >= 4.11 && < 4.20,
35-
bytestring >= 0.9,
36-
http-client >= 0.4 && < 0.8,
37-
http-types >= 0.8,
38-
hackage-security >= 0.5 && < 0.7
35+
build-depends: base >= 4.11 && < 4.20,
36+
bytestring >= 0.10.8.2 && < 0.13,
37+
http-client >= 0.4 && < 0.8,
38+
http-types >= 0.12.4 && < 0.13,
39+
hackage-security >= 0.5 && < 0.7
3940
hs-source-dirs: src
4041
default-language: Haskell2010
4142
default-extensions: FlexibleContexts

‎hackage-security/hackage-security.cabal‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -108,38 +108,37 @@ library
108108
Hackage.Security.Util.Stack
109109
Hackage.Security.Util.TypedEmbedded
110110

111-
build-depends: base >= 4.11 && < 4.20,
112-
base16-bytestring >= 0.1.1 && < 1.1,
113-
base64-bytestring >= 1.0 && < 1.3,
114-
bytestring >= 0.9 && < 0.13,
115-
containers >= 0.4 && < 0.8,
116-
cryptohash-sha256 >= 0.11 && < 0.12,
117-
directory >= 1.2.2 && < 1.4,
118-
ed25519 >= 0.0 && < 0.1,
119-
filepath >= 1.2 && < 1.5,
120-
mtl >= 2.2 && < 2.4,
121-
parsec >= 3.1 && < 3.2,
122-
pretty >= 1.0 && < 1.2,
111+
build-depends: base >= 4.11 && < 4.20,
112+
base16-bytestring >= 0.1.1 && < 1.1,
113+
base64-bytestring >= 1.0 && < 1.3,
114+
bytestring >= 0.10.8.2 && < 0.13,
115+
containers >= 0.5.11 && < 0.8,
116+
cryptohash-sha256 >= 0.11 && < 0.12,
117+
directory >= 1.3.1.5 && < 1.4,
118+
ed25519 >= 0.0 && < 0.1,
119+
filepath >= 1.4.2 && < 1.5,
120+
mtl >= 2.2.2 && < 2.4,
121+
parsec >= 3.1.13 && < 3.2,
122+
pretty >= 1.0 && < 1.2,
123123
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
124124
-- functionality, 0.5.0 changes type of serialise
125-
tar >= 0.5 && < 0.7,
126-
template-haskell >= 2.7 && < 2.22,
127-
time >= 1.5 && < 1.13,
128-
transformers >= 0.3 && < 0.7,
125+
tar >= 0.5 && < 0.7,
126+
template-haskell >= 2.13 && < 2.22,
127+
time >= 1.8.0.2 && < 1.13,
128+
transformers >= 0.3 && < 0.7,
129129
zlib >= 0.5 && < 0.8,
130130
-- whatever versions are bundled with ghc:
131-
ghc-prim
131+
ghc-prim >= 0.5.2 && < 0.12
132132

133133
if flag(lukko)
134134
build-depends: lukko >= 0.1 && < 0.2
135135
else
136136
build-depends: base >= 4.11
137137

138-
if flag(Cabal-syntax) && impl(ghc >= 8.2)
138+
if flag(Cabal-syntax)
139139
build-depends: Cabal-syntax >= 3.7 && < 3.12
140140
else
141-
build-depends: Cabal >= 1.14 && < 1.26
142-
|| >= 2.0 && < 2.6
141+
build-depends: Cabal >= 2.2.0.1 && < 2.6
143142
|| >= 3.0 && < 3.7,
144143
Cabal-syntax < 3.7
145144

@@ -240,12 +239,11 @@ test-suite TestSuite
240239
time,
241240
zlib
242241

243-
if flag(Cabal-syntax) && impl(ghc >= 8.2)
242+
if flag(Cabal-syntax)
244243
build-depends: Cabal >= 3.7 && < 3.12,
245244
Cabal-syntax >= 3.7 && < 3.12
246245
else
247-
build-depends: Cabal >= 1.14 && < 1.26
248-
|| >= 2.0 && < 2.6
246+
build-depends: Cabal >= 2.2.0.1 && < 2.6
249247
|| >= 3.0 && < 3.7,
250248
Cabal-syntax < 3.7
251249

‎precompute-fileinfo/precompute-fileinfo.cabal‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ tested-with:
2727

2828
executable precompute-fileinfo
2929
main-is: Main.hs
30-
build-depends: base >= 4.11,
31-
bytestring >= 0.9,
32-
containers >= 0.4,
33-
deepseq >= 1.3,
34-
filepath >= 1.2,
35-
optparse-applicative >= 0.11,
36-
SHA >= 1.6,
37-
tar >= 0.4,
38-
zlib >= 0.5
30+
build-depends: base >= 4.11 && < 4.20,
31+
bytestring >= 0.10.8.2 && < 0.13,
32+
containers >= 0.5.11 && < 0.7,
33+
deepseq >= 1.4.3 && < 1.6,
34+
filepath >= 1.4.2 && < 1.5,
35+
optparse-applicative >= 0.13 && < 0.19,
36+
SHA >= 1.6.4 && < 1.7,
37+
tar >= 0.6.0 && < 0.7,
38+
zlib >= 0.6.3 && < 0.7
3939
hs-source-dirs: src
4040
default-language: Haskell2010
4141
default-extensions: RecordWildCards

0 commit comments

Comments
 (0)