on master help sign in
Merge
e27ec46Bryan O'Sullivan
Data/Aeson/Encode.hs+2−1
@@ -29,9 +29,10 @@ module Data.Aeson.Encode
29
29
30import Data.Aeson.Types (Value(..))
30import Data.Aeson.Types (Value(..))
31import Data.Monoid (mappend)
31import Data.Monoid (mappend)
32−import Data.Scientific (Scientific, coefficient, base10Exponent, scientificBuilder)
32+import Data.Scientific (Scientific, coefficient, base10Exponent)
33import Data.Text.Lazy.Builder
33import Data.Text.Lazy.Builder
34import Data.Text.Lazy.Builder.Int (decimal)
34import Data.Text.Lazy.Builder.Int (decimal)
35+import Data.Text.Lazy.Builder.Scientific (scientificBuilder)
35import Numeric (showHex)
36import Numeric (showHex)
36import qualified Data.HashMap.Strict as H
37import qualified Data.HashMap.Strict as H
37import qualified Data.Text as T
38import qualified Data.Text as T
aeson.cabal+1−1
@@ -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.2 && < 0.3,
106+ scientific >= 0.3,
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,