git.iko.soy/jsaddle
on master help sign in
GHC 8.6 compatibility
336ed68Will Fancher
jsaddle-warp/jsaddle-warp.cabal+1−1
compare with master
unifiedsplit
@@ -29,7 +29,7 @@ library
29 build-depends:
29 build-depends:
30 aeson >=0.8.0.2 && <1.5,
30 aeson >=0.8.0.2 && <1.5,
31 bytestring >=0.10.6.0 && <0.11,
31 bytestring >=0.10.6.0 && <0.11,
32− containers >=0.5.6.2 && <0.6,
32+ containers >=0.5.6.2 && <0.7,
33 foreign-store >=0.2 && <0.3,
33 foreign-store >=0.2 && <0.3,
34 http-types >=0.8.6 && <0.13,
34 http-types >=0.8.6 && <0.13,
35 jsaddle >=0.9.4.0 && <0.10,
35 jsaddle >=0.9.4.0 && <0.10,
jsaddle/jsaddle.cabal+2−2
@@ -36,7 +36,7 @@ library
36 else
36 else
37 build-depends:
37 build-depends:
38 attoparsec >=0.11 && <0.14,
38 attoparsec >=0.11 && <0.14,
39− containers >=0.5.6.2 && <0.6,
39+ containers >=0.5.6.2 && <0.7,
40 deepseq >=1.3 && < 1.5,
40 deepseq >=1.3 && < 1.5,
41 filepath >=1.4.0.0 && <1.5,
41 filepath >=1.4.0.0 && <1.5,
42 ghc-prim,
42 ghc-prim,
@@ -112,7 +112,7 @@ library
112 base64-bytestring >=1.0.0.1 && <1.1,
112 base64-bytestring >=1.0.0.1 && <1.1,
113 bytestring >=0.10.6.0 && <0.11,
113 bytestring >=0.10.6.0 && <0.11,
114 exceptions >=0.8 && <0.11,
114 exceptions >=0.8 && <0.11,
115− lens >=3.8.5 && <4.17,
115+ lens >=3.8.5 && <4.18,
116 primitive >=0.6.1.0 && <0.7,
116 primitive >=0.6.1.0 && <0.7,
117 text >=1.2.1.3 && <1.3,
117 text >=1.2.1.3 && <1.3,
118 transformers >=0.4.2.0 && <0.6
118 transformers >=0.4.2.0 && <0.6
jsaddle/src/Language/Javascript/JSaddle/Types.hs+2−1
@@ -124,6 +124,7 @@ import Data.Aeson
124 (defaultOptions, genericToEncoding, ToJSON(..), FromJSON(..), Value)
124 (defaultOptions, genericToEncoding, ToJSON(..), FromJSON(..), Value)
125import GHC.Generics (Generic)
125import GHC.Generics (Generic)
126import Control.Monad.IO.Unlift (MonadUnliftIO)
126import Control.Monad.IO.Unlift (MonadUnliftIO)
127+import qualified Control.Monad.Fail as Fail
127#endif
128#endif
128
129
129#if MIN_VERSION_base(4,9,0) && defined(CHECK_UNCHECKED)
130#if MIN_VERSION_base(4,9,0) && defined(CHECK_UNCHECKED)
@@ -165,7 +166,7 @@ data JSContextRef = JSContextRef {
165type JSM = IO
166type JSM = IO
166#else
167#else
167newtype JSM a = JSM { unJSM :: ReaderT JSContextRef IO a }
168newtype 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)
169
170
170instance MonadCatch JSM where
171instance MonadCatch JSM where
171 t `catch` c = JSM (unJSM (syncAfter t) `catch` \e -> unJSM (c e))
172 t `catch` c = JSM (unJSM (syncAfter t) `catch` \e -> unJSM (c e))