on master help sign in
Merge pull request #705 from phadej/semigroups-0.19

Allow semigroups-0.19 and hashable-1.3

commit544cfdc9346e70b8e6753a899badd1ab58e48e6f authorAdam Bergmark <adam@bergmark.nl> dateThu 30 May 2019, 15:33 (7 years ago) parent7e89722da62e1a
2 files changed+27−30
aeson.cabal+3−3 benchmarks/aeson-benchmarks.cabal+24−27
aeson.cabal+3−3
@@ -132,7 +132,7 @@ library
132132 if !impl(ghc >= 8.0)
133133 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
134134 build-depends:
135− semigroups >= 0.18.5 && < 0.19,
135+ semigroups >= 0.18.5 && < 0.20,
136136 transformers >= 0.3.0.0 && < 0.6,
137137 transformers-compat >= 0.6.2 && < 0.7,
138138 fail == 4.9.*
@@ -154,7 +154,7 @@ library
154154 build-depends:
155155 attoparsec >= 0.13.2.2 && < 0.14,
156156 dlist >= 0.8.0.4 && < 0.9,
157− hashable >= 1.2.7.0 && < 1.3,
157+ hashable >= 1.2.7.0 && < 1.4,
158158 scientific >= 0.3.6.2 && < 0.4,
159159 th-abstraction >= 0.2.8.0 && < 0.4,
160160 time-locale-compat >= 0.1.1.5 && < 0.2,
@@ -254,7 +254,7 @@ test-suite tests
254254
255255 if !impl(ghc >= 8.0)
256256 build-depends:
257− semigroups >= 0.18.2 && < 0.19,
257+ semigroups >= 0.18.2 && < 0.20,
258258 transformers >= 0.2.2.0,
259259 transformers-compat >= 0.3
260260
benchmarks/aeson-benchmarks.cabal+24−27
@@ -28,45 +28,42 @@ library
2828 hs-source-dirs: .. ../ffi ../pure ../attoparsec-iso8601
2929 c-sources: ../cbits/unescape_string.c
3030 build-depends:
31− attoparsec >= 0.13.0.1,
32− base == 4.*,
33− base-compat >= 0.9.1 && <0.11,
34− time-locale-compat >=0.1.1 && <0.2,
31+ attoparsec,
32+ base,
33+ base-compat,
3534 containers,
3635 deepseq,
37− dlist >= 0.2,
38− fail == 4.9.*,
39− ghc-prim >= 0.2,
40− hashable >= 1.1.2.0,
36+ dlist,
37+ fail,
38+ ghc-prim,
39+ hashable,
4140 mtl,
42− primitive >= 0.6.1,
43− scientific >= 0.3.4.7 && < 0.4,
41+ primitive,
42+ scientific,
4443 syb,
45− tagged >=0.8.3 && <0.9,
46− template-haskell >= 2.4,
47− text >= 1.2.3,
48− th-abstraction >= 0.2.2 && < 0.4,
44+ tagged,
45+ template-haskell,
46+ text,
47+ th-abstraction,
4948 time-compat,
5049 time,
5150 transformers,
52− unordered-containers >= 0.2.3.0,
53− uuid-types >= 1.0.3 && <1.1,
54− vector >= 0.7.1
55−
56− if !impl(ghc >= 7.10)
57− -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
58− build-depends: nats >= 1 && < 1.2
51+ unordered-containers,
52+ uuid-types,
53+ vector
5954
60− if impl(ghc >=7.8)
61− cpp-options: -DHAS_COERCIBLE
55+ if !impl(ghc >= 8.6)
56+ build-depends: contravariant
6257
6358 if !impl(ghc >= 8.0)
6459 -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
65− build-depends: semigroups >= 0.18.2 && < 0.19
60+ build-depends: semigroups,
61+ transformers-compat
6662
67− if !impl(ghc >= 8.6)
68− build-depends:
69− contravariant >=1.4.1 && <1.6
63+ if !impl(ghc >= 7.10)
64+ -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
65+ build-depends: nats,
66+ void
7067
7168 include-dirs: ../include
7269