diff --git a/.gitignore b/.gitignore index 15e62b1..d454c6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /dist/ +dump/ .stack-work/ diff --git a/src/Data/Thyme/Clock/TAI.hs b/src/Data/Thyme/Clock/TAI.hs index 5867c37..0872430 100644 --- a/src/Data/Thyme/Clock/TAI.hs +++ b/src/Data/Thyme/Clock/TAI.hs @@ -41,6 +41,9 @@ import Prelude #if !MIN_VERSION_base(4,8,0) import Control.Applicative #endif +#if __GLASGOW_HASKELL__ < 710 +import Data.Monoid (mappend) +#endif import Control.DeepSeq import Control.Lens import Control.Monad @@ -354,4 +357,3 @@ utcToTAITime = view . absoluteTime {-# INLINE taiToUTCTime #-} taiToUTCTime :: TAIUTCMap -> AbsoluteTime -> UTCTime taiToUTCTime = review . absoluteTime - diff --git a/src/Data/Thyme/Format.hs b/src/Data/Thyme/Format.hs index 62bdab7..3f2fe2d 100644 --- a/src/Data/Thyme/Format.hs +++ b/src/Data/Thyme/Format.hs @@ -30,6 +30,9 @@ import Control.Applicative #if SHOW_INTERNAL import Control.Arrow #endif +#if __GLASGOW_HASKELL__ < 710 +import Data.Monoid (mappend) +#endif import Control.Lens import Control.Monad.Trans import Control.Monad.State.Strict diff --git a/thyme.cabal b/thyme.cabal index 170b0eb..1999b86 100644 --- a/thyme.cabal +++ b/thyme.cabal @@ -32,7 +32,7 @@ flag bug-for-bug manual: True flag docs - description: include extra packages for Data.Thyme.Docs; implies -flens + description: include extra packages for Data.Thyme.Docs default: False manual: True