dcdd6a8 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Fix use-template-haskell flag

commitdcdd6a81866340c6cd1d8ecf7eb14418ff7529f2 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateFri 25 Nov 2016, 14:51 (10 years ago) parent0fd331b

2 files changed+10−3

compare with develop

unifiedsplit

reflex-dom.cabal+6−3 src/Foreign/JavaScript/TH.hs+4

reflex-dom.cabal+6−3

@@ -42,7 +42,6 @@ library

4242 contravariant >= 1.4 && < 1.5,

4343 data-default >= 0.5 && < 0.8,

4444 dependent-map == 0.2.*,

45− dependent-sum == 0.3.*,

4645 directory == 1.2.*,

4746 exception-transformers == 0.4.*,

4847 ghcjs-dom >= 0.7.0.0 && < 0.8,

@@ -57,7 +56,6 @@ library

5756 reflex == 0.5.*,

5857 semigroups >= 0.16 && < 0.19,

5958 stm == 2.4.*,

60− template-haskell,

6159 text == 1.2.*,

6260 these >= 0.4 && < 0.8,

6361 time >= 1.4 && < 1.7,

@@ -111,9 +109,14 @@ library

111109

112110 if flag(use-template-haskell)

113111 build-depends:

114− dependent-sum-template >= 0.0.0.5 && < 0.1

112+ dependent-sum == 0.3.*,

113+ dependent-sum-template >= 0.0.0.5 && < 0.1,

114+ template-haskell

115115 other-extensions: TemplateHaskell

116116 cpp-options: -DUSE_TEMPLATE_HASKELL

117+ else

118+ build-depends:

119+ dependent-sum == 0.4.*

117120

118121--test-suite hlint

119122-- build-depends: base, hlint == 1.9.*

src/Foreign/JavaScript/TH.hs+4

@@ -19,7 +19,9 @@

1919{-# LANGUAGE JavaScriptFFI #-}

2020#endif

2121module Foreign.JavaScript.TH ( module Foreign.JavaScript.TH

22+#ifdef USE_TEMPLATE_HASKELL

2223 , Safety (..)

24+#endif

2325 ) where

2426

2527import Prelude hiding((!!))

@@ -31,7 +33,9 @@ import Reflex.PerformEvent.Class

3133import Reflex.PostBuild.Base

3234import Reflex.Requester.Base

3335

36+#ifdef USE_TEMPLATE_HASKELL

3437import Language.Haskell.TH

38+#endif

3539

3640import GHCJS.DOM.Types

3741 (toJSString, liftJSM, askJSM, runJSM, JSContextRef,