git.iko.soy/reflex
on develop help sign in
Merge branch 'lowerbounds'

Conflicts: reflex.cabal

commit8b9ab7f5fcbdd977f47613cc737dcac06bf58401 authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 24 Mar 2015, 12:03 (12 years ago) parent2e384489bd45a5
2 files changed+9−5
compare with develop
unifiedsplit
reflex.cabal+4−3 src/Reflex/Dynamic.hs+5−2
reflex.cabal+4−3
@@ -10,21 +10,22 @@ Stability: Experimental
1010Category: FRP
1111Build-type: Simple
1212Cabal-version: >=1.9.2
13+homepage: https://github.com/ryantrinkle/reflex
1314bug-reports: https://github.com/ryantrinkle/reflex/issues
1415
1516library
1617 hs-source-dirs: src
1718 build-depends:
18− base == 4.8.*,
19+ base >= 4.7 && < 4.9,
1920 dependent-sum == 0.2.*,
2021 dependent-map == 0.1.*,
2122 semigroups == 0.16.*,
2223 mtl == 2.2.*,
2324 containers == 0.5.*,
2425 these == 0.4.*,
25− lens == 4.7.*,
26+ lens >= 4.7 && < 4.9,
2627 primitive == 0.5.*,
27− template-haskell == 2.10.*
28+ template-haskell >= 2.9 && < 2.11
2829
2930 exposed-modules:
3031 Reflex,
src/Reflex/Dynamic.hs+5−2
@@ -37,13 +37,16 @@ module Reflex.Dynamic ( Dynamic -- Abstract so we can preserve the law that the
3737 , unsafeDynamic
3838 ) where
3939
40+import Prelude hiding (mapM, mapM_)
41+
4042import Reflex.Class
4143import Data.Functor.Misc
4244
43−import Control.Monad
45+import Control.Monad hiding (mapM, mapM_, forM, forM_)
4446import Control.Monad.Fix
45−import Control.Monad.Identity
47+import Control.Monad.Identity hiding (mapM, mapM_, forM, forM_)
4648import Data.These
49+import Data.Traversable (mapM, forM)
4750import Data.Align
4851import Data.Map (Map)
4952import qualified Data.Map as Map