a9acbcf · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Merge pull request #81 from ElvishJerricco/ghc-8.6

GHC 8.6 compatibility

commita9acbcf966ea9fa14d36813da3e94d75bd9acf76 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateWed 9 Jan 2019, 00:44 (8 years ago) parent68208be 336ed68

3 files changed+5−4

compare with master

unifiedsplit

jsaddle-warp/jsaddle-warp.cabal+1−1 jsaddle/jsaddle.cabal+2−2 jsaddle/src/Language/Javascript/JSaddle/Types.hs+2−1

jsaddle-warp/jsaddle-warp.cabal+1−1

@@ -29,7 +29,7 @@ library

2929 build-depends:

3030 aeson >=0.8.0.2 && <1.5,

3131 bytestring >=0.10.6.0 && <0.11,

32− containers >=0.5.6.2 && <0.6,

32+ containers >=0.5.6.2 && <0.7,

3333 foreign-store >=0.2 && <0.3,

3434 http-types >=0.8.6 && <0.13,

3535 jsaddle >=0.9.4.0 && <0.10,

jsaddle/jsaddle.cabal+2−2

@@ -36,7 +36,7 @@ library

3636 else

3737 build-depends:

3838 attoparsec >=0.11 && <0.14,

39− containers >=0.5.6.2 && <0.6,

39+ containers >=0.5.6.2 && <0.7,

4040 deepseq >=1.3 && < 1.5,

4141 filepath >=1.4.0.0 && <1.5,

4242 ghc-prim,

@@ -112,7 +112,7 @@ library

112112 base64-bytestring >=1.0.0.1 && <1.1,

113113 bytestring >=0.10.6.0 && <0.11,

114114 exceptions >=0.8 && <0.11,

115− lens >=3.8.5 && <4.17,

115+ lens >=3.8.5 && <4.18,

116116 primitive >=0.6.1.0 && <0.7,

117117 text >=1.2.1.3 && <1.3,

118118 transformers >=0.4.2.0 && <0.6

jsaddle/src/Language/Javascript/JSaddle/Types.hs+2−1

@@ -124,6 +124,7 @@ import Data.Aeson

124124 (defaultOptions, genericToEncoding, ToJSON(..), FromJSON(..), Value)

125125import GHC.Generics (Generic)

126126import Control.Monad.IO.Unlift (MonadUnliftIO)

127+import qualified Control.Monad.Fail as Fail

127128#endif

128129

129130#if MIN_VERSION_base(4,9,0) && defined(CHECK_UNCHECKED)

@@ -165,7 +166,7 @@ data JSContextRef = JSContextRef {

165166type JSM = IO

166167#else

167168newtype JSM a = JSM { unJSM :: ReaderT JSContextRef IO a }

168− deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadThrow, MonadUnliftIO)

169+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadThrow, MonadUnliftIO, Fail.MonadFail)

169170

170171instance MonadCatch JSM where

171172 t `catch` c = JSM (unJSM (syncAfter t) `catch` \e -> unJSM (c e))