haskell/colonnade-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make it build with ghc 8.2.2 and ghc 8.0.2

Browse Source
This commit is contained in:
Andrew Martin 2018-07-03 16:17:36 -04:00
parent 36cf1917d8
commit d17193baae
No known key found for this signature in database
GPG Key ID: 4FEE56C538F773B4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-colonnade/src/Yesod/Colonnade.hs
View File

@ -32,6 +32,8 @@ import Data.String (IsString(..))
import Text.Blaze (Attribute,toValue) import Text.Blaze (Attribute,toValue)
import Data.Foldable import Data.Foldable
import Yesod.Elements (table_,thead_,tbody_,tr_,td_,th_,ul_,li_,a_) 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.Attributes as HA
import qualified Text.Blaze.Html5 as H import qualified Text.Blaze.Html5 as H
import qualified Colonnade.Encode as E 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) Cell a1 c1 <> Cell a2 c2 = Cell (mappend a1 a2) (mappend c1 c2)
instance Monoid (Cell site) where instance Monoid (Cell site) where
mempty = Cell mempty mempty mempty = Cell mempty mempty
mappend = (<>) mappend = (SG.<>)
-- | Create a 'Cell' from a 'Widget' -- | Create a 'Cell' from a 'Widget'
cell :: WidgetFor site () -> Cell site cell :: WidgetFor site () -> Cell site

4
yesod-colonnade/yesod-colonnade.cabal
View File

@ -1,6 +1,6 @@
cabal-version: 2.0 cabal-version: 2.0
name: yesod-colonnade name: yesod-colonnade
version: 1.3.0 version: 1.3.0.1
synopsis: Helper functions for using yesod with colonnade synopsis: Helper functions for using yesod with colonnade
description: Yesod and colonnade description: Yesod and colonnade
homepage: https://github.com/andrewthad/colonnade#readme homepage: https://github.com/andrewthad/colonnade#readme
@ -17,7 +17,7 @@ library
exposed-modules: exposed-modules:
Yesod.Colonnade Yesod.Colonnade
build-depends: build-depends:
base >= 4.9 && < 4.12 base >= 4.9.1.0 && < 4.12
, colonnade >= 1.2 && < 1.3 , colonnade >= 1.2 && < 1.3
, yesod-core >= 1.6 && < 1.7 , yesod-core >= 1.6 && < 1.7
, conduit >= 1.3 && < 1.4 , conduit >= 1.3 && < 1.4