diff --git a/yesod-colonnade/src/Yesod/Colonnade.hs b/yesod-colonnade/src/Yesod/Colonnade.hs index 684e2a9..5fb0a35 100644 --- a/yesod-colonnade/src/Yesod/Colonnade.hs +++ b/yesod-colonnade/src/Yesod/Colonnade.hs @@ -32,6 +32,8 @@ import Data.String (IsString(..)) import Text.Blaze (Attribute,toValue) import Data.Foldable import Yesod.Elements (table_,thead_,tbody_,tr_,td_,th_,ul_,li_,a_) +import Data.Semigroup (Semigroup) +import qualified Data.Semigroup as SG import qualified Text.Blaze.Html5.Attributes as HA import qualified Text.Blaze.Html5 as H import qualified Colonnade.Encode as E @@ -53,7 +55,7 @@ instance Semigroup (Cell site) where Cell a1 c1 <> Cell a2 c2 = Cell (mappend a1 a2) (mappend c1 c2) instance Monoid (Cell site) where mempty = Cell mempty mempty - mappend = (<>) + mappend = (SG.<>) -- | Create a 'Cell' from a 'Widget' cell :: WidgetFor site () -> Cell site diff --git a/yesod-colonnade/yesod-colonnade.cabal b/yesod-colonnade/yesod-colonnade.cabal index 37d0edf..b64d6e9 100644 --- a/yesod-colonnade/yesod-colonnade.cabal +++ b/yesod-colonnade/yesod-colonnade.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 name: yesod-colonnade -version: 1.3.0 +version: 1.3.0.1 synopsis: Helper functions for using yesod with colonnade description: Yesod and colonnade homepage: https://github.com/andrewthad/colonnade#readme @@ -17,7 +17,7 @@ library exposed-modules: Yesod.Colonnade build-depends: - base >= 4.9 && < 4.12 + base >= 4.9.1.0 && < 4.12 , colonnade >= 1.2 && < 1.3 , yesod-core >= 1.6 && < 1.7 , conduit >= 1.3 && < 1.4