on master help sign in
Allow semigroups-0.19 and hashable-1.3
da62e1aOleg Grenrus
aeson.cabal+3−3
@@ -132,7 +132,7 @@ library
132 if !impl(ghc >= 8.0)
132 if !impl(ghc >= 8.0)
133 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
133 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
134 build-depends:
134 build-depends:
135− semigroups >= 0.18.5 && < 0.19,
135+ semigroups >= 0.18.5 && < 0.20,
136 transformers >= 0.3.0.0 && < 0.6,
136 transformers >= 0.3.0.0 && < 0.6,
137 transformers-compat >= 0.6.2 && < 0.7,
137 transformers-compat >= 0.6.2 && < 0.7,
138 fail == 4.9.*
138 fail == 4.9.*
@@ -154,7 +154,7 @@ library
154 build-depends:
154 build-depends:
155 attoparsec >= 0.13.2.2 && < 0.14,
155 attoparsec >= 0.13.2.2 && < 0.14,
156 dlist >= 0.8.0.4 && < 0.9,
156 dlist >= 0.8.0.4 && < 0.9,
157− hashable >= 1.2.7.0 && < 1.3,
157+ hashable >= 1.2.7.0 && < 1.4,
158 scientific >= 0.3.6.2 && < 0.4,
158 scientific >= 0.3.6.2 && < 0.4,
159 th-abstraction >= 0.2.8.0 && < 0.4,
159 th-abstraction >= 0.2.8.0 && < 0.4,
160 time-locale-compat >= 0.1.1.5 && < 0.2,
160 time-locale-compat >= 0.1.1.5 && < 0.2,
@@ -254,7 +254,7 @@ test-suite tests
254
254
255 if !impl(ghc >= 8.0)
255 if !impl(ghc >= 8.0)
256 build-depends:
256 build-depends:
257− semigroups >= 0.18.2 && < 0.19,
257+ semigroups >= 0.18.2 && < 0.20,
258 transformers >= 0.2.2.0,
258 transformers >= 0.2.2.0,
259 transformers-compat >= 0.3
259 transformers-compat >= 0.3
260
260
benchmarks/aeson-benchmarks.cabal+24−27
@@ -28,45 +28,42 @@ library
28 hs-source-dirs: .. ../ffi ../pure ../attoparsec-iso8601
28 hs-source-dirs: .. ../ffi ../pure ../attoparsec-iso8601
29 c-sources: ../cbits/unescape_string.c
29 c-sources: ../cbits/unescape_string.c
30 build-depends:
30 build-depends:
31− attoparsec >= 0.13.0.1,
31+ attoparsec,
32− base == 4.*,
32+ base,
33− base-compat >= 0.9.1 && <0.11,
33+ base-compat,
34− time-locale-compat >=0.1.1 && <0.2,
35 containers,
34 containers,
36 deepseq,
35 deepseq,
37− dlist >= 0.2,
36+ dlist,
38− fail == 4.9.*,
37+ fail,
39− ghc-prim >= 0.2,
38+ ghc-prim,
40− hashable >= 1.1.2.0,
39+ hashable,
41 mtl,
40 mtl,
42− primitive >= 0.6.1,
41+ primitive,
43− scientific >= 0.3.4.7 && < 0.4,
42+ scientific,
44 syb,
43 syb,
45− tagged >=0.8.3 && <0.9,
44+ tagged,
46− template-haskell >= 2.4,
45+ template-haskell,
47− text >= 1.2.3,
46+ text,
48− th-abstraction >= 0.2.2 && < 0.4,
47+ th-abstraction,
49 time-compat,
48 time-compat,
50 time,
49 time,
51 transformers,
50 transformers,
52− unordered-containers >= 0.2.3.0,
51+ unordered-containers,
53− uuid-types >= 1.0.3 && <1.1,
52+ uuid-types,
54− vector >= 0.7.1
53+ vector
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
59
54
60− if impl(ghc >=7.8)
55+ if !impl(ghc >= 8.6)
61− cpp-options: -DHAS_COERCIBLE
56+ build-depends: contravariant
62
57
63 if !impl(ghc >= 8.0)
58 if !impl(ghc >= 8.0)
64 -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
59 -- `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
66
62
67− if !impl(ghc >= 8.6)
63+ if !impl(ghc >= 7.10)
64+ -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
68− build-depends:
65+ build-depends: nats,
69− contravariant >=1.4.1 && <1.6
66+ void
70
67
71 include-dirs: ../include
68 include-dirs: ../include
72
69