From 49f819c54cbc3c3a09d7dc8da7187e2cb7908add Mon Sep 17 00:00:00 2001 From: Tissevert Date: Wed, 9 Dec 2020 11:06:47 +0100 Subject: [PATCH] Add version guards for Monoid imports --- src/Arguments.hs | 3 +++ src/Blog/Path.hs | 3 +++ src/Blog/Skin.hs | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/Arguments.hs b/src/Arguments.hs index a2a6fe2..a762abe 100644 --- a/src/Arguments.hs +++ b/src/Arguments.hs @@ -1,9 +1,12 @@ +{-# LANGUAGE CPP #-} module Arguments ( Arguments(..) , get ) where +#if !MIN_VERSION_base(4,11,0) import Data.Monoid ((<>)) +#endif import Data.Version (showVersion) import Control.Applicative ((<|>), (<**>), optional) import Options.Applicative ( diff --git a/src/Blog/Path.hs b/src/Blog/Path.hs index a0f8fcd..ee60dad 100644 --- a/src/Blog/Path.hs +++ b/src/Blog/Path.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} module Blog.Path ( Path(..) , build @@ -11,7 +12,9 @@ import qualified Arguments as Arguments (Arguments(..)) import Control.Monad (join) import Control.Monad.Except (MonadError(..), ExceptT(..), runExceptT) import Data.Aeson (ToJSON(..), (.=), pairs) +#if !MIN_VERSION_base(4,11,0) import Data.Monoid ((<>)) +#endif import Files (File(..), filePath) import GHC.Generics (Generic) diff --git a/src/Blog/Skin.hs b/src/Blog/Skin.hs index 3ac39b8..35370c8 100644 --- a/src/Blog/Skin.hs +++ b/src/Blog/Skin.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} module Blog.Skin ( Skin(..) , build @@ -11,7 +12,9 @@ import qualified Arguments (bannerPath, favicon, cardImage, headPath, previewArt import Control.Monad (filterM) import Data.Aeson (ToJSON(..), (.=), pairs) import Data.Maybe (listToMaybe) +#if !MIN_VERSION_base(4,11,0) import Data.Monoid ((<>)) +#endif import Files (absoluteLink) import GHC.Generics (Generic) import Prelude hiding (head)