summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendanHay <>2019-02-06 07:37:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-02-06 07:37:00 (GMT)
commita382fd618e0b778e33806627aad733210baf2380 (patch)
tree194ef4ec68e34c4081c8d76b18a44ac799a6f290
parentd522fe029b7c7bbc6acab8ff27d41c380d13506f (diff)
version 1.6.1HEAD1.6.1master
-rw-r--r--amazonka-core.cabal2
-rw-r--r--src/Network/AWS/Data/Text.hs6
-rw-r--r--src/Network/AWS/Data/Time.hs2
-rw-r--r--src/Network/AWS/Types.hs1
4 files changed, 9 insertions, 2 deletions
diff --git a/amazonka-core.cabal b/amazonka-core.cabal
index 3a533e1..9796e00 100644
--- a/amazonka-core.cabal
+++ b/amazonka-core.cabal
@@ -1,5 +1,5 @@
name: amazonka-core
-version: 1.6.0
+version: 1.6.1
synopsis: Core data types and functionality for Amazonka libraries.
homepage: https://github.com/brendanhay/amazonka
bug-reports: https://github.com/brendanhay/amazonka/issues
diff --git a/src/Network/AWS/Data/Text.hs b/src/Network/AWS/Data/Text.hs
index 768844f..3d9f2a6 100644
--- a/src/Network/AWS/Data/Text.hs
+++ b/src/Network/AWS/Data/Text.hs
@@ -72,6 +72,9 @@ class FromText a where
instance FromText Text where
parser = A.takeText
+instance FromText String where
+ parser = Text.unpack <$> A.takeText
+
instance FromText ByteString where
parser = Text.encodeUtf8 <$> A.takeText
@@ -84,6 +87,9 @@ instance FromText Char where
instance FromText Int where
parser = A.signed A.decimal <* A.endOfInput
+instance FromText Int64 where
+ parser = A.signed A.decimal <* A.endOfInput
+
instance FromText Integer where
parser = A.signed A.decimal <* A.endOfInput
diff --git a/src/Network/AWS/Data/Time.hs b/src/Network/AWS/Data/Time.hs
index 9f41866..4336f60 100644
--- a/src/Network/AWS/Data/Time.hs
+++ b/src/Network/AWS/Data/Time.hs
@@ -97,7 +97,7 @@ class TimeFormat a where
format :: Tagged a String
instance TimeFormat RFC822 where format = Tagged "%a, %d %b %Y %H:%M:%S GMT"
-instance TimeFormat ISO8601 where format = Tagged (iso8601DateFormat (Just "%X%QZ"))
+instance TimeFormat ISO8601 where format = Tagged (iso8601DateFormat (Just "%XZ"))
instance TimeFormat BasicTime where format = Tagged "%Y%m%d"
instance TimeFormat AWSTime where format = Tagged "%Y%m%dT%H%M%SZ"
diff --git a/src/Network/AWS/Types.hs b/src/Network/AWS/Types.hs
index 0795364..2272f8a 100644
--- a/src/Network/AWS/Types.hs
+++ b/src/Network/AWS/Types.hs
@@ -762,6 +762,7 @@ newtype Seconds = Seconds Int
, ToQuery
, ToByteString
, ToText
+ , FromText
)
instance Hashable Seconds