Skip to content

Commit 1aa38b1

Browse files
authored
Merge pull request #908 from haskell/remove-bytestring-builder-flag
Remove bytestring-builder flag, cleanup pre-GHC-8 conditionals
2 parents 596499d + 0711873 commit 1aa38b1

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

aeson.cabal

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ extra-source-files:
4545
tests/JSONTestSuite/test_parsing/*.json
4646
tests/JSONTestSuite/test_transform/*.json
4747

48-
flag bytestring-builder
49-
description:
50-
Depend on the bytestring-builder package for backwards compatibility.
51-
52-
default: False
53-
manual: False
54-
5548
flag cffi
5649
description:
5750
Controls whether to include c-ffi bits or pure haskell. Default to False for security.
@@ -189,6 +182,7 @@ test-suite aeson-tests
189182
, base-compat
190183
, base-orphans >=0.5.3 && <0.9
191184
, base16-bytestring
185+
, bytestring
192186
, containers
193187
, data-fix
194188
, Diff >=0.4 && <0.5
@@ -220,25 +214,6 @@ test-suite aeson-tests
220214
, uuid-types
221215
, vector
222216

223-
if flag(bytestring-builder)
224-
build-depends:
225-
bytestring >=0.9 && <0.10.4
226-
, bytestring-builder >=0.10.4 && <1
227-
228-
else
229-
build-depends: bytestring >=0.10.4
230-
231-
if !impl(ghc >=8.0)
232-
build-depends:
233-
semigroups >=0.18.2 && <0.20
234-
, transformers >=0.2.2.0
235-
, transformers-compat >=0.3
236-
237-
if !impl(ghc >=7.10)
238-
build-depends:
239-
nats >=1 && <1.2
240-
, void >=0.7.2 && <0.8
241-
242217
source-repository head
243218
type: git
244219
location: git://github.com/haskell/aeson.git

0 commit comments

Comments
 (0)