git.iko.soy/typeable/aeson
on master help sign in
Merge from 0.11
commit0db49c9d08d4376edd9809c2d4ab3e444e316f02 authorBryan O'Sullivan <bos@serpentine.com> dateFri 16 May 2014, 21:15 (12 years ago) parent1d75c1fe6d989e
2 files changed+4−2
compare with master
unifiedsplit
.hgtags+2 aeson.cabal+2−2
.hgtags+2
@@ -31,3 +31,5 @@ cdeff57d78ec76d81541249d48f6def4958175c3 0.7.0.1
31310aef582b3bf1e44a81892cb73c1dcccc8ae22b22 0.7.0.2
323293b496b0ee9a5ed762ae53618c1681e9c605efd8 0.7.0.3
3333ea18d6545a480f824a16c68083ee78d79b9b6e2c 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
9393 Data.Aeson.Types.Internal
9494
9595 build-depends:
96− attoparsec >= 0.11.3.0,
96+ attoparsec >= 0.11.3.4,
9797 base == 4.*,
9898 bytestring >= 0.10.4.0,
9999 containers,
@@ -103,7 +103,7 @@ library
103103 hashable >= 1.1.2.0,
104104 mtl,
105105 old-locale,
106− scientific >= 0.3,
106+ scientific >= 0.3.1 && < 0.4,
107107 syb,
108108 template-haskell >= 2.4,
109109 text >= 1.1.1.0,