git.iko.soy/patch
on develop help sign in
Merge branch 'lowerbounds'
8b9ab7fRyan Trinkle
reflex.cabal+4−3
compare with develop
unifiedsplit
@@ -10,21 +10,22 @@ Stability: Experimental
10Category: FRP
10Category: FRP
11Build-type: Simple
11Build-type: Simple
12Cabal-version: >=1.9.2
12Cabal-version: >=1.9.2
13+homepage: https://github.com/ryantrinkle/reflex
13bug-reports: https://github.com/ryantrinkle/reflex/issues
14bug-reports: https://github.com/ryantrinkle/reflex/issues
14
15
15library
16library
16 hs-source-dirs: src
17 hs-source-dirs: src
17 build-depends:
18 build-depends:
18− base == 4.8.*,
19+ base >= 4.7 && < 4.9,
19 dependent-sum == 0.2.*,
20 dependent-sum == 0.2.*,
20 dependent-map == 0.1.*,
21 dependent-map == 0.1.*,
21 semigroups == 0.16.*,
22 semigroups == 0.16.*,
22 mtl == 2.2.*,
23 mtl == 2.2.*,
23 containers == 0.5.*,
24 containers == 0.5.*,
24 these == 0.4.*,
25 these == 0.4.*,
25− lens == 4.7.*,
26+ lens >= 4.7 && < 4.9,
26 primitive == 0.5.*,
27 primitive == 0.5.*,
27− template-haskell == 2.10.*
28+ template-haskell >= 2.9 && < 2.11
28
29
29 exposed-modules:
30 exposed-modules:
30 Reflex,
31 Reflex,
src/Reflex/Dynamic.hs+5−2
@@ -37,13 +37,16 @@ module Reflex.Dynamic ( Dynamic -- Abstract so we can preserve the law that the
37 , unsafeDynamic
37 , unsafeDynamic
38 ) where
38 ) where
39
39
40+import Prelude hiding (mapM, mapM_)
41+
40import Reflex.Class
42import Reflex.Class
41import Data.Functor.Misc
43import Data.Functor.Misc
42
44
43−import Control.Monad
45+import Control.Monad hiding (mapM, mapM_, forM, forM_)
44import Control.Monad.Fix
46import Control.Monad.Fix
45−import Control.Monad.Identity
47+import Control.Monad.Identity hiding (mapM, mapM_, forM, forM_)
46import Data.These
48import Data.These
49+import Data.Traversable (mapM, forM)
47import Data.Align
50import Data.Align
48import Data.Map (Map)
51import Data.Map (Map)
49import qualified Data.Map as Map
52import qualified Data.Map as Map