958a68c · reflex · git.iko.soy

Add constraints-extras dependency; Fix Eq instance for PatchDMapWithMove

commit958a68cbb07338d97703e71ddde5ce6645c350aa authorAli Abrar <aliabrar@gmail.com> dateTue 14 May 2019, 16:35 (7 years ago) parent22c3a90

2 files changed+4−2

unifiedsplit

default.nix+2−1

@@ -6,7 +6,7 @@

66, template-haskell , these, time, transformers

77, transformers-compat, unbounded-delays, prim-uniq

88, data-default, filepath, directory, filemanip, ghcjs-base

9−, monoidal-containers, witherable

9+, monoidal-containers, witherable, constraints-extras

1010, useTemplateHaskell ? true

1111}:

1212mkDerivation {

@@ -22,6 +22,7 @@ mkDerivation {

2222 base bifunctors containers deepseq dependent-map dependent-sum

2323 mtl ref-tf split transformers data-default

2424 random time unbounded-delays monoidal-containers witherable

25+ constraints-extras

2526 ] ++ (if ghc.isGhcjs or false then [

2627 ghcjs-base

2728 ] else []) ++ (if !useTemplateHaskell then [] else [

src/Reflex/Patch/DMapWithMove.hs+2−1

@@ -106,7 +106,8 @@ validationErrorsForPatchDMapWithMove m =

106106 unbalancedMove _ = Nothing

107107

108108-- |Test whether two @'PatchDMapWithMove' k v@ contain the same patch operations.

109−instance (GEq k, Has' Eq k (NodeInfo k v)) => Eq (PatchDMapWithMove k v) where

109+-- TODO: Get rid of EqTag constraint once dependent-map > 0.2.4.0, which drops this requirement, is released

110+instance (GEq k, Has' Eq k (NodeInfo k v), EqTag k (NodeInfo k v)) => Eq (PatchDMapWithMove k v) where

110111 PatchDMapWithMove a == PatchDMapWithMove b = a == b

111112

112113-- |Higher kinded 2-tuple, identical to @Data.Functor.Product@ from base ≥ 4.9