Skip to content

Commit

Permalink
Bounds covering ghc-8.4.4 and ghc-9.8.1
Browse files Browse the repository at this point in the history 
- Match ghc-8.4.4 included package lower bounds
- Add cabal gen-bounds bounds
  • Loading branch information
@philderbeast
philderbeast committed Jan 23, 2024
1 parent abe628d commit 2e0bb86
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 63 deletions.
12 changes: 6 additions & 6 deletions example-client/example-client.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ executable example-client
other-modules: ExampleClient.Options

build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.9,
directory >= 1.2,
filepath >= 1.2,
optparse-applicative >= 0.11,
time >= 1.5,
bytestring >= 0.10.8.2,
directory >= 1.3.1.5,
filepath >= 1.4.2,
optparse-applicative >= 0.13,
time >= 1.8.0.2,
hackage-security >= 0.5,
hackage-security-HTTP,
hackage-security-curl,
Expand All @@ -65,5 +65,5 @@ executable example-client
if flag(Cabal-syntax)
build-depends: Cabal-syntax >= 3.7 && < 3.12
else
build-depends: Cabal >= 1.12 && < 3.7,
build-depends: Cabal >= 2.2.0.1 && < 3.7,
Cabal-syntax < 3.7
17 changes: 8 additions & 9 deletions hackage-repo-tool/hackage-repo-tool.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@ executable hackage-repo-tool

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

-- For non-boot libraries we try to support single major versions
-- to reduce the risk of semantic differences
build-depends: microlens >= 0.4.11.2 && < 0.5,
optparse-applicative >= 0.15.1 && < 0.18,
optparse-applicative >= 0.13 && < 0.19,
tar >= 0.5 && < 0.7,
zlib >= 0.6 && < 0.7,
hackage-security >= 0.6 && < 0.7
Expand All @@ -88,8 +88,7 @@ executable hackage-repo-tool
if flag(Cabal-syntax)
build-depends: Cabal-syntax >= 3.7 && < 3.12
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
build-depends: Cabal >= 2.2.0.1 && < 2.6
|| >= 3.0 && < 3.7,
Cabal-syntax < 3.7

Expand Down
6 changes: 3 additions & 3 deletions hackage-root-tool/hackage-root-tool.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ source-repository head
executable hackage-root-tool
main-is: Main.hs
build-depends: base >= 4.11 && < 5,
filepath >= 1.2 && < 1.5,
optparse-applicative >= 0.11 && < 0.18,
hackage-security >= 0.5 && < 0.7
filepath >= 1.4.2 && < 1.5,
optparse-applicative >= 0.13 && < 0.19,
hackage-security >= 0.5 && < 0.7
default-language: Haskell2010
other-extensions: CPP, ScopedTypeVariables, RecordWildCards
ghc-options: -Wall
4 changes: 2 additions & 2 deletions hackage-security-HTTP/hackage-security-HTTP.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ flag use-network-uri
library
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.9 && < 0.13,
bytestring >= 0.10.8.2 && < 0.13,
HTTP >= 4000.2.19 && < 4000.5,
mtl >= 2.1 && < 2.4,
mtl >= 2.2.2 && < 2.4,
zlib >= 0.5 && < 0.7,
hackage-security >= 0.5 && < 0.7
hs-source-dirs: src
Expand Down
8 changes: 4 additions & 4 deletions hackage-security-curl/hackage-security-curl.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ flag use-network-uri

library
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.9,
process >= 1.1,
hackage-security
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.10.8.2 && < 0.13,
process >= 1.6.3 && < 1.7,
hackage-security >= 0.6.2 && < 0.7
hs-source-dirs: src
default-language: Haskell2010
ghc-options: -Wall
Expand Down
11 changes: 6 additions & 5 deletions hackage-security-http-client/hackage-security-http-client.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ copyright: Copyright 2015 Well-Typed LLP
category: Distribution
build-type: Simple
cabal-version: >=1.10
extra-source-files: ChangeLog.md

tested-with:
GHC == 9.8.1
Expand All @@ -31,11 +32,11 @@ flag use-network-uri

library
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.9,
http-client >= 0.4 && < 0.8,
http-types >= 0.8,
hackage-security >= 0.5 && < 0.7
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.10.8.2 && < 0.13,
http-client >= 0.4 && < 0.8,
http-types >= 0.12.4 && < 0.13,
hackage-security >= 0.5 && < 0.7
hs-source-dirs: src
default-language: Haskell2010
default-extensions: FlexibleContexts
Expand Down
47 changes: 22 additions & 25 deletions hackage-security/hackage-security.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,38 +108,36 @@ library
Hackage.Security.Util.Stack
Hackage.Security.Util.TypedEmbedded

build-depends: base >= 4.11 && < 4.20,
base16-bytestring >= 0.1.1 && < 1.1,
base64-bytestring >= 1.0 && < 1.3,
bytestring >= 0.9 && < 0.13,
containers >= 0.4 && < 0.8,
cryptohash-sha256 >= 0.11 && < 0.12,
directory >= 1.2.2 && < 1.4,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.2 && < 1.5,
mtl >= 2.2 && < 2.4,
parsec >= 3.1 && < 3.2,
pretty >= 1.0 && < 1.2,
build-depends: base >= 4.11 && < 4.20,
base16-bytestring >= 0.1.1 && < 1.1,
base64-bytestring >= 1.0 && < 1.3,
bytestring >= 0.10.8.2 && < 0.13,
containers >= 0.5.11 && < 0.8,
cryptohash-sha256 >= 0.11 && < 0.12,
directory >= 1.3.1.5 && < 1.4,
ed25519 >= 0.0 && < 0.1,
filepath >= 1.4.2 && < 1.5,
mtl >= 2.2.2 && < 2.4,
parsec >= 3.1.13 && < 3.2,
pretty >= 1.0 && < 1.2,
-- 0.4.2 introduces TarIndex, 0.4.4 introduces more
-- functionality, 0.5.0 changes type of serialise
tar >= 0.5 && < 0.7,
template-haskell >= 2.7 && < 2.22,
time >= 1.5 && < 1.13,
transformers >= 0.3 && < 0.7,
zlib >= 0.5 && < 0.7,
-- whatever versions are bundled with ghc:
ghc-prim
tar >= 0.5 && < 0.7,
template-haskell >= 2.13 && < 2.22,
time >= 1.8.0.2 && < 1.13,
transformers >= 0.3 && < 0.7,
zlib >= 0.5 && < 0.7,
ghc-prim >= 0.5.2 && < 0.12

if flag(lukko)
build-depends: lukko >= 0.1 && < 0.2
else
build-depends: base >= 4.11

if flag(Cabal-syntax) && impl(ghc >= 8.2)
if flag(Cabal-syntax)
build-depends: Cabal-syntax >= 3.7 && < 3.12
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
build-depends: Cabal >= 2.2.0.1 && < 2.6
|| >= 3.0 && < 3.7,
Cabal-syntax < 3.7

Expand Down Expand Up @@ -240,12 +238,11 @@ test-suite TestSuite
time,
zlib

if flag(Cabal-syntax) && impl(ghc >= 8.2)
if flag(Cabal-syntax)
build-depends: Cabal >= 3.7 && < 3.12,
Cabal-syntax >= 3.7 && < 3.12
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
build-depends: Cabal >= 2.2.0.1 && < 2.6
|| >= 3.0 && < 3.7,
Cabal-syntax < 3.7

Expand Down
18 changes: 9 additions & 9 deletions precompute-fileinfo/precompute-fileinfo.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ tested-with:

executable precompute-fileinfo
main-is: Main.hs
build-depends: base >= 4.11,
bytestring >= 0.9,
containers >= 0.4,
deepseq >= 1.3,
filepath >= 1.2,
optparse-applicative >= 0.11,
SHA >= 1.6,
tar >= 0.4,
zlib >= 0.5
build-depends: base >= 4.11 && < 4.20,
bytestring >= 0.10.8.2 && < 0.13,
containers >= 0.5.11 && < 0.7,
deepseq >= 1.4.3 && < 1.6,
filepath >= 1.4.2 && < 1.5,
optparse-applicative >= 0.13 && < 0.19,
SHA >= 1.6.4 && < 1.7,
tar >= 0.6.0 && < 0.7,
zlib >= 0.6.3 && < 0.7
hs-source-dirs: src
default-language: Haskell2010
default-extensions: RecordWildCards
Expand Down

0 comments on commit 2e0bb86

Please sign in to comment.