diff --git a/yampa/Yampa.cabal b/yampa/Yampa.cabal index 7074478..6f94fd6 100644 --- a/yampa/Yampa.cabal +++ b/yampa/Yampa.cabal @@ -130,7 +130,7 @@ library ghc-options: -O3 -Wall -fno-warn-name-shadowing - if !impl(ghc >= 8.0) + if !impl(ghc >= 8.0) && !impl(mhs) build-depends: fail == 4.9.* diff --git a/yampa/src/FRP/Yampa/InternalCore.hs b/yampa/src/FRP/Yampa/InternalCore.hs index 04bdfcc..bb8168b 100644 --- a/yampa/src/FRP/Yampa/InternalCore.hs +++ b/yampa/src/FRP/Yampa/InternalCore.hs @@ -85,13 +85,13 @@ module FRP.Yampa.InternalCore where -- External imports -#if __GLASGOW_HASKELL__ < 710 +#if __GLASGOW_HASKELL__ < 710 && !defined(__MHS__) import Control.Applicative (Applicative(..)) #endif import Control.Arrow (Arrow (..), ArrowChoice (..), ArrowLoop (..), (>>>)) -#if __GLASGOW_HASKELL__ >= 610 +#if __GLASGOW_HASKELL__ >= 610 || defined(__MHS__) import qualified Control.Category (Category(..)) #endif @@ -270,7 +270,7 @@ vfyNoEv _ _ = -- * Arrow instance and implementation -#if __GLASGOW_HASKELL__ >= 610 +#if __GLASGOW_HASKELL__ >= 610 || defined(__MHS__) -- | Composition and identity for SFs. instance Control.Category.Category SF where (.) = flip compPrim @@ -329,7 +329,7 @@ instance Arrow SF where (***) = parSplitPrim (&&&) = parFanOutPrim -#if __GLASGOW_HASKELL__ >= 610 +#if __GLASGOW_HASKELL__ >= 610 || defined(__MHS__) #else (>>>) = compPrim #endif