git.iko.soy/typeable/bloodhound
on master help sign in
merge master
b3d943cJosh Berman
bloodhound.cabal+1−1
compare with master
unifiedsplit
@@ -44,7 +44,7 @@ library
44 build-depends: base >= 4.3 && <5,
44 build-depends: base >= 4.3 && <5,
45 bytestring >= 0.10.0 && <0.11,
45 bytestring >= 0.10.0 && <0.11,
46 containers >= 0.5.0.0 && <0.6,
46 containers >= 0.5.0.0 && <0.6,
47− aeson >= 0.11.1 && <1.1,
47+ aeson >= 0.11.1 && <1.2,
48 http-client >= 0.4.30 && <0.6,
48 http-client >= 0.4.30 && <0.6,
49 network-uri >= 2.6 && <2.7,
49 network-uri >= 2.6 && <2.7,
50 semigroups >= 0.15 && <0.19,
50 semigroups >= 0.15 && <0.19,
changelog.md+7
@@ -1,3 +1,10 @@
1+0.12.1.0
2+===================
3+* @michaelxavier
4+ - #162 Allow Aeson 1.1
5+* @bermanjosh
6+ - #159 Fix bug with tie breaker json instance for MultiMatchQuery
7+
10.12.0.0
80.12.0.0
2===================
9===================
3This release contains several new APIs, documentation fixes, and some minor type updates, and steps towards ES 2.0 support. Thanks to all of our contributors!
10This release contains several new APIs, documentation fixes, and some minor type updates, and steps towards ES 2.0 support. Thanks to all of our contributors!
src/Database/V1/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/V1/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