on master help sign in
Merge from 0.11
0db49c9Bryan O'Sullivan
@@ -31,3 +31,5 @@ cdeff57d78ec76d81541249d48f6def4958175c3 0.7.0.1
310aef582b3bf1e44a81892cb73c1dcccc8ae22b22 0.7.0.2
310aef582b3bf1e44a81892cb73c1dcccc8ae22b22 0.7.0.2
3293b496b0ee9a5ed762ae53618c1681e9c605efd8 0.7.0.3
3293b496b0ee9a5ed762ae53618c1681e9c605efd8 0.7.0.3
33ea18d6545a480f824a16c68083ee78d79b9b6e2c 0.7.0.4
33ea18d6545a480f824a16c68083ee78d79b9b6e2c 0.7.0.4
34+3bfd2588b31f9cd70c759998422f208ec66b34ef 0.7.0.5
35+743be245cdfa38548dcd1a0017f67b32375a171c 0.7.0.6
aeson.cabal+2−2
@@ -93,7 +93,7 @@ library
93 Data.Aeson.Types.Internal
93 Data.Aeson.Types.Internal
94
94
95 build-depends:
95 build-depends:
96− attoparsec >= 0.11.3.0,
96+ attoparsec >= 0.11.3.4,
97 base == 4.*,
97 base == 4.*,
98 bytestring >= 0.10.4.0,
98 bytestring >= 0.10.4.0,
99 containers,
99 containers,
@@ -103,7 +103,7 @@ library
103 hashable >= 1.1.2.0,
103 hashable >= 1.1.2.0,
104 mtl,
104 mtl,
105 old-locale,
105 old-locale,
106− scientific >= 0.3,
106+ scientific >= 0.3.1 && < 0.4,
107 syb,
107 syb,
108 template-haskell >= 2.4,
108 template-haskell >= 2.4,
109 text >= 1.1.1.0,
109 text >= 1.1.1.0,