haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yesod: blaze-html 0.5

Browse Source
This commit is contained in:
Michael Snoyman 2012-04-23 15:13:29 +03:00
parent 49ebe878f0
commit 82cf5d5b61
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yesod/Yesod.hs
View File

@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
-- | This module simply re-exports from other modules for your convenience. -- | This module simply re-exports from other modules for your convenience.
module Yesod module Yesod
( -- * Re-exports from yesod-core ( -- * Re-exports from yesod-core
@ -53,7 +54,11 @@ import Network.Wai.Logger
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import System.IO (stderr, stdout, hFlush, hPutStrLn) import System.IO (stderr, stdout, hFlush, hPutStrLn)
import System.Log.FastLogger import System.Log.FastLogger
#if MIN_VERSION_blaze_html(0, 5, 0)
import Text.Blaze.Html (toHtml)
#else
import Text.Blaze (toHtml) import Text.Blaze (toHtml)
#endif
showIntegral :: Integral a => a -> String showIntegral :: Integral a => a -> String
showIntegral x = show (fromIntegral x :: Integer) showIntegral x = show (fromIntegral x :: Integer)

16
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 1.0.1.1 version: 1.0.1.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -66,6 +66,10 @@ flag threaded
default: True default: True
description: Build with support for multithreaded execution description: Build with support for multithreaded execution
flag blaze_html_0_5
description: use blaze-html 0.5 and blaze-markup 0.5
default: False
library library
if flag(ghc7) if flag(ghc7)
build-depends: base >= 4.3 && < 5 build-depends: base >= 4.3 && < 5
@ -86,7 +90,15 @@ library
, shakespeare-js >= 1.0 && < 1.1 , shakespeare-js >= 1.0 && < 1.1
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, warp >= 1.2 && < 1.3 , warp >= 1.2 && < 1.3
, blaze-html >= 0.4.1.3 && < 0.5
if flag(blaze_html_0_5)
build-depends:
blaze-html >= 0.5 && < 0.6
, blaze-markup >= 0.5.1 && < 0.6
else
build-depends:
blaze-html >= 0.4 && < 0.5
exposed-modules: Yesod exposed-modules: Yesod
ghc-options: -Wall ghc-options: -Wall