git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #165 from bitemyapp/aeson-1.1
974733bChris Allen
bloodhound.cabal+1−1
@@ -32,7 +32,7 @@ library
32 build-depends: base >= 4.3 && <5,
32 build-depends: base >= 4.3 && <5,
33 bytestring >= 0.10.0 && <0.11,
33 bytestring >= 0.10.0 && <0.11,
34 containers >= 0.5.0.0 && <0.6,
34 containers >= 0.5.0.0 && <0.6,
35− aeson >= 0.11.1 && <1.1,
35+ aeson >= 0.11.1 && <1.2,
36 http-client >= 0.4.30 && <0.6,
36 http-client >= 0.4.30 && <0.6,
37 network-uri >= 2.6 && <2.7,
37 network-uri >= 2.6 && <2.7,
38 semigroups >= 0.15 && <0.19,
38 semigroups >= 0.15 && <0.19,
src/Database/Bloodhound/Types.hs+1−1
@@ -2012,7 +2012,7 @@ instance BucketAggregation DateRangeResult where
2012 docCount = dateRangeDocCount
2012 docCount = dateRangeDocCount
2013 aggs = dateRangeAggs
2013 aggs = dateRangeAggs
2014
2014
2015−instance (FromJSON a, BucketAggregation a) => FromJSON (Bucket a) where
2015+instance (FromJSON a) => FromJSON (Bucket a) where
2016 parseJSON (Object v) = Bucket <$>
2016 parseJSON (Object v) = Bucket <$>
2017 v .: "buckets"
2017 v .: "buckets"
2018 parseJSON _ = mempty
2018 parseJSON _ = mempty
stack-8.0.yaml+1−1
@@ -3,7 +3,7 @@ packages:
3- '.'
3- '.'
4extra-deps:
4extra-deps:
5- quickcheck-properties-0.1
5- quickcheck-properties-0.1
6−
6+- aeson-1.1.0.0
7# - http-client-0.5.0
7# - http-client-0.5.0
8# - fail-4.9.0.0
8# - fail-4.9.0.0
9# - http-types-0.9
9# - http-types-0.9
tests/tests.hs+1−1
@@ -586,7 +586,7 @@ instance ApproxEq Vers.Version where
586 (=~) = (==)
586 (=~) = (==)
587instance (ApproxEq a, Show a) => ApproxEq [a] where
587instance (ApproxEq a, Show a) => ApproxEq [a] where
588 as =~ bs = and (zipWith (=~) as bs)
588 as =~ bs = and (zipWith (=~) as bs)
589−instance (ApproxEq l, Show l, ApproxEq r, Show r) => ApproxEq (Either l r) where
589+instance (ApproxEq l, ApproxEq r) => ApproxEq (Either l r) where
590 Left a =~ Left b = a =~ b
590 Left a =~ Left b = a =~ b
591 Right a =~ Right b = a =~ b
591 Right a =~ Right b = a =~ b
592 _ =~ _ = False
592 _ =~ _ = False