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

Initial cabal file update for 0.10, everything is broken

Browse Source
This commit is contained in:
Michael Snoyman 2011-12-27 15:54:49 +02:00
parent 74b1dc4a77
commit 7036402b0a
13 changed files with 86 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yesod-auth/yesod-auth.cabal
View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 0.7.9 version: 0.8.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin
@ -23,8 +23,8 @@ library
build-depends: base >= 4 && < 4.3 build-depends: base >= 4 && < 4.3
build-depends: authenticate >= 0.10.4 && < 0.11 build-depends: authenticate >= 0.10.4 && < 0.11
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, yesod-core >= 0.9.3.4 && < 0.10 , yesod-core >= 0.10 && < 0.11
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, template-haskell , template-haskell
, pureMD5 >= 2.0 && < 2.2 , pureMD5 >= 2.0 && < 2.2
, random >= 1.0.0.2 && < 1.1 , random >= 1.0.0.2 && < 1.1
@ -32,19 +32,19 @@ library
, text >= 0.7 && < 0.12 , text >= 0.7 && < 0.12
, mime-mail >= 0.3 && < 0.5 , mime-mail >= 0.3 && < 0.5
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
, yesod-persistent >= 0.2 && < 0.3 , yesod-persistent >= 0.3 && < 0.4
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, shakespeare-css >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11
, yesod-json >= 0.2 && < 0.3 , yesod-json >= 0.3 && < 0.4
, containers , containers
, unordered-containers , unordered-containers
, yesod-form >= 0.3 && < 0.4 , yesod-form >= 0.4 && < 0.5
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, persistent >= 0.6 && < 0.7 , persistent >= 0.7 && < 0.8
, persistent-template >= 0.6 && < 0.7 , persistent-template >= 0.7 && < 0.8
, SHA >= 1.4.1.3 && < 1.6 , SHA >= 1.4.1.3 && < 1.6
, http-enumerator >= 0.6 && < 0.8 , http-conduit >= 1.0 && < 1.1
, aeson >= 0.3 , aeson >= 0.5
, pwstore-fast >= 2.2 && < 3 , pwstore-fast >= 2.2 && < 3
exposed-modules: Yesod.Auth exposed-modules: Yesod.Auth

113
yesod-core/Yesod/Config.hs
View File

@ -1,113 +0,0 @@
{-# LANGUAGE OverloadedStrings #-}
module Yesod.Config
{-# DEPRECATED "This code has been moved to yesod-default. This module will be removed in the next major version bump." #-}
( AppConfig(..)
, loadConfig
, withYamlEnvironment
) where
import Control.Monad (join)
import Data.Maybe (fromMaybe)
import Data.Object
import Data.Object.Yaml
import Data.Text (Text)
import qualified Data.Text as T
-- | Dynamic per-environment configuration which can be loaded at
-- run-time negating the need to recompile between environments.
data AppConfig e = AppConfig
{ appEnv :: e
, appPort :: Int
, appRoot :: Text
} deriving (Show)
-- | Load an @'AppConfig'@ from @config\/settings.yml@.
--
-- Some examples:
--
-- > -- typical local development
-- > Development:
-- > host: localhost
-- > port: 3000
-- >
-- > -- ssl: will default false
-- > -- approot: will default to "http://localhost:3000"
--
-- > -- typical outward-facing production box
-- > Production:
-- > host: www.example.com
-- >
-- > -- ssl: will default false
-- > -- port: will default 80
-- > -- approot: will default "http://www.example.com"
--
-- > -- maybe you're reverse proxying connections to the running app
-- > -- on some other port
-- > Production:
-- > port: 8080
-- > approot: "http://example.com"
-- >
-- > -- approot is specified so that the non-80 port is not appended
-- > -- automatically.
--
loadConfig :: Show e => e -> IO (AppConfig e)
loadConfig env = withYamlEnvironment "config/settings.yml" env $ \e' -> do
e <- maybe (fail "Expected map") return $ fromMapping e'
let mssl = lookupScalar "ssl" e
let mhost = lookupScalar "host" e
let mport = lookupScalar "port" e
let mapproot = lookupScalar "approot" e
-- set some default arguments
let ssl = maybe False toBool mssl
port <- safeRead "port" $ fromMaybe (if ssl then "443" else "80") mport
approot <- case (mhost, mapproot) of
(_ , Just ar) -> return ar
(Just host, _ ) -> return $ T.concat
[ if ssl then "https://" else "http://"
, host
, addPort ssl port
]
_ -> fail "You must supply either a host or approot"
return $ AppConfig
{ appEnv = env
, appPort = port
, appRoot = approot
}
where
toBool :: Text -> Bool
toBool = (`elem` ["true", "TRUE", "yes", "YES", "Y", "1"])
addPort :: Bool -> Int -> Text
addPort True 443 = ""
addPort False 80 = ""
addPort _ p = T.pack $ ':' : show p
-- | Loads the configuration block in the passed file named by the
-- passed environment, yeilds to the passed function as a mapping.
--
-- Errors in the case of a bad load or if your function returns
-- @Nothing@.
withYamlEnvironment :: Show e
=> FilePath -- ^ the yaml file
-> e -- ^ the environment you want to load
-> (TextObject -> IO a) -- ^ what to do with the mapping
-> IO a
withYamlEnvironment fp env f = do
obj <- join $ decodeFile fp
envs <- fromMapping obj
conf <- maybe (fail $ "Could not find environment: " ++ show env) return
$ lookup (T.pack $ show env) envs
f conf
-- | Returns 'fail' if read fails
safeRead :: Monad m => String -> Text -> m Int
safeRead name t = case reads s of
(i, _):_ -> return i
[] -> fail $ concat ["Invalid value for ", name, ": ", s]
where
s = T.unpack t

15
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 0.9.4 version: 0.10.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -46,12 +46,12 @@ library
build-depends: wai-test build-depends: wai-test
build-depends: time >= 1.1.4 build-depends: time >= 1.1.4
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, wai-extra >= 0.4.1 && < 0.5 , wai-extra >= 1.0 && < 1.1
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, text >= 0.7 && < 0.12 , text >= 0.7 && < 0.12
, template-haskell , template-haskell
, path-pieces >= 0.0 && < 0.1 , path-pieces >= 0.1 && < 0.2
, hamlet >= 0.10.6 && < 0.11 , hamlet >= 0.10.6 && < 0.11
, shakespeare >= 0.10 && < 0.11 , shakespeare >= 0.10 && < 0.11
, shakespeare-js >= 0.10.4 && < 0.11 , shakespeare-js >= 0.10.4 && < 0.11
@ -65,9 +65,8 @@ library
, old-locale >= 1.0.0.2 && < 1.1 , old-locale >= 1.0.0.2 && < 1.1
, failure >= 0.1 && < 0.2 , failure >= 0.1 && < 0.2
, containers >= 0.2 && < 0.5 , containers >= 0.2 && < 0.5
, monad-control >= 0.2 && < 0.4 , monad-control >= 0.3 && < 0.4
, transformers-base >= 0.4 , transformers-base >= 0.4
, enumerator >= 0.4.8 && < 0.5
, cookie >= 0.3 && < 0.4 , cookie >= 0.3 && < 0.4
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
, http-types >= 0.6.5 && < 0.7 , http-types >= 0.6.5 && < 0.7
@ -77,7 +76,7 @@ library
, data-object >= 0.3 && < 0.4 , data-object >= 0.3 && < 0.4
, data-object-yaml >= 0.3 && < 0.4 , data-object-yaml >= 0.3 && < 0.4
, vector >= 0.9 && < 0.10 , vector >= 0.9 && < 0.10
, aeson >= 0.3 , aeson >= 0.5
, fast-logger >= 0.0.1 , fast-logger >= 0.0.1
, wai-logger >= 0.0.1 , wai-logger >= 0.0.1
@ -89,7 +88,6 @@ library
Yesod.Request Yesod.Request
Yesod.Widget Yesod.Widget
Yesod.Message Yesod.Message
Yesod.Config
Yesod.Internal.TestApi Yesod.Internal.TestApi
other-modules: Yesod.Internal other-modules: Yesod.Internal
Yesod.Internal.Cache Yesod.Internal.Cache
@ -129,7 +127,6 @@ test-suite tests
, random , random
,HUnit ,HUnit
,QuickCheck >= 2 && < 3 ,QuickCheck >= 2 && < 3
, enumerator
ghc-options: -Wall ghc-options: -Wall
source-repository head source-repository head

10
yesod-default/yesod-default.cabal
View File

@ -1,5 +1,5 @@
name: yesod-default name: yesod-default
version: 0.5.0 version: 0.6.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Patrick Brisbin author: Patrick Brisbin
@ -18,11 +18,11 @@ library
cpp-options: -DWINDOWS cpp-options: -DWINDOWS
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.9.4 && < 0.10 , yesod-core >= 0.10 && < 0.11
, cmdargs >= 0.8 , cmdargs >= 0.8
, warp >= 0.4 && < 0.5 , warp >= 1.0 && < 1.1
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, wai-extra >= 0.4.4 && < 0.5 , wai-extra >= 1.0 && < 1.1
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, text >= 0.9 , text >= 0.9

13
yesod-form/yesod-form.cabal
View File

@ -1,5 +1,5 @@
name: yesod-form name: yesod-form
version: 0.3.4.2 version: 0.4.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -14,25 +14,24 @@ description: Form handling support for Yesod Web Framework
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.9 && < 0.10 , yesod-core >= 0.10 && < 0.11
, yesod-persistent >= 0.2 && < 0.3 , yesod-persistent >= 0.3 && < 0.4
, time >= 1.1.4 , time >= 1.1.4
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, shakespeare-css >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, persistent >= 0.6 && < 0.7 , persistent >= 0.6 && < 0.7
, yesod-persistent >= 0.2 && < 0.3
, template-haskell , template-haskell
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, data-default >= 0.3 && < 0.4 , data-default >= 0.3 && < 0.4
, xss-sanitize >= 0.3.0.1 && < 0.4 , xss-sanitize >= 0.3.0.1 && < 0.4
, blaze-builder >= 0.2.1.4 && < 0.4 , blaze-builder >= 0.2.1.4 && < 0.4
, network >= 2.2 && < 2.4 , network >= 2.2 && < 2.4
, email-validate >= 0.2.6 && < 0.3 , email-validate >= 0.2.6 && < 0.3
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, text >= 0.9 && < 0.12 , text >= 0.9 && < 1.0
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, containers >= 0.2 && < 0.5 , containers >= 0.2 && < 0.5
exposed-modules: Yesod.Form exposed-modules: Yesod.Form
Yesod.Form.Class Yesod.Form.Class

40
yesod-json/Yesod/Json.hs
View File

@ -7,11 +7,10 @@ module Yesod.Json
, jsonToRepJson , jsonToRepJson
-- * Convert to a JSON value -- * Convert to a JSON value
, parseJsonBody , parseJsonBody
-- * Compatibility wrapper for old API -- * Produce JSON values
, Json , J.Value (..)
, jsonScalar , toObject
, jsonList , toArray
, jsonMap
) where ) where
import Yesod.Handler (GHandler) import Yesod.Handler (GHandler)
@ -25,32 +24,22 @@ import qualified Data.Aeson as J
import qualified Data.Aeson.Encode as JE import qualified Data.Aeson.Encode as JE
import Data.Aeson.Encode (fromValue) import Data.Aeson.Encode (fromValue)
import Data.Attoparsec.Enumerator (iterParser) import Data.Attoparsec.Enumerator (iterParser)
import Data.Text (pack) import Data.Text (text, pack)
import Control.Arrow (first) import Control.Arrow (first)
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
#if MIN_VERSION_aeson(0, 4, 0)
import Data.HashMap.Strict (fromList) import Data.HashMap.Strict (fromList)
#else
import Data.Map (fromList)
#endif
import qualified Data.Vector as V import qualified Data.Vector as V
import Text.Julius (ToJavascript (..)) import Text.Julius (ToJavascript (..))
import Data.Text.Lazy.Builder (fromLazyText) import Data.Text.Lazy.Builder (fromLazyText)
import Data.Text.Lazy.Encoding (decodeUtf8) import Data.Text.Lazy.Encoding (decodeUtf8)
#if MIN_VERSION_aeson(0, 5, 0)
import Data.Text.Lazy.Builder (toLazyText) import Data.Text.Lazy.Builder (toLazyText)
import qualified Blaze.ByteString.Builder.Char.Utf8 as Blaze import qualified Blaze.ByteString.Builder.Char.Utf8 as Blaze
#endif
instance ToContent J.Value where instance ToContent J.Value where
#if MIN_VERSION_aeson(0, 5, 0)
toContent = flip ContentBuilder Nothing toContent = flip ContentBuilder Nothing
. Blaze.fromLazyText . Blaze.fromLazyText
. toLazyText . toLazyText
. fromValue . fromValue
#else
toContent = flip ContentBuilder Nothing . fromValue
#endif
-- | Provide both an HTML and JSON representation for a piece of data, using -- | Provide both an HTML and JSON representation for a piece of data, using
-- the default layout for the HTML output ('defaultLayout'). -- the default layout for the HTML output ('defaultLayout').
@ -73,16 +62,13 @@ parseJsonBody :: GHandler sub master J.Value
parseJsonBody = lift $ iterParser J.json' parseJsonBody = lift $ iterParser J.json'
type Json = J.Value
jsonScalar :: String -> Json
jsonScalar = J.String . pack
jsonList :: [Json] -> Json
jsonList = J.Array . V.fromList
jsonMap :: [(String, Json)] -> Json
jsonMap = J.Object . fromList . map (first pack)
instance ToJavascript J.Value where instance ToJavascript J.Value where
toJavascript = fromLazyText . decodeUtf8 . JE.encode toJavascript = fromLazyText . decodeUtf8 . JE.encode
-- | Convert a list of pairs to an 'J.Object'.
toObject :: [(Text, J.Value)] -> J.Value
toObject = J.Object . fromList
-- | Convert a list of values to an 'J.Array'.
toArray :: [J.Value] -> J.Value
toArray = J.Array . V.fromList

10
yesod-json/yesod-json.cabal
View File

@ -1,5 +1,5 @@
name: yesod-json name: yesod-json
version: 0.2.3 version: 0.3.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -14,12 +14,12 @@ description: Generate content for Yesod using the aeson package.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.9 && < 0.10 , yesod-core >= 0.10 && < 0.11
, aeson >= 0.3 , aeson >= 0.5
, text >= 0.8 && < 0.12 , text >= 0.8 && < 1.0
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, vector >= 0.9 , vector >= 0.9
, containers >= 0.2 && < 0.5 , containers >= 0.2
, unordered-containers , unordered-containers
, blaze-builder , blaze-builder
, attoparsec-enumerator >= 0.3 && < 0.4 , attoparsec-enumerator >= 0.3 && < 0.4

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

@ -1,5 +1,5 @@
name: yesod-newsfeed name: yesod-newsfeed
version: 0.3.2 version: 0.4.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin
@ -14,7 +14,7 @@ description: Helper functions and data types for producing News feeds.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.9 && < 0.10 , yesod-core >= 0.10 && < 0.11
, time >= 1.1.4 , time >= 1.1.4
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10

8
yesod-persistent/yesod-persistent.cabal
View File

@ -1,5 +1,5 @@
name: yesod-persistent name: yesod-persistent
version: 0.2.2 version: 0.3.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -14,9 +14,9 @@ description: Some helpers for using Persistent from Yesod.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.8 && < 0.10 , yesod-core >= 0.10 && < 0.11
, persistent >= 0.6 && < 0.7 , persistent >= 0.7 && < 0.8
, persistent-template >= 0.6 && < 0.7 , persistent-template >= 0.7 && < 0.8
, failure >= 0.1 && < 0.2 , failure >= 0.1 && < 0.2
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
exposed-modules: Yesod.Persist exposed-modules: Yesod.Persist

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

@ -1,5 +1,5 @@
name: yesod-sitemap name: yesod-sitemap
version: 0.2.2 version: 0.3.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -14,7 +14,7 @@ description: Generate XML sitemaps.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.9 && < 0.10 , yesod-core >= 0.10 && < 0.11
, time >= 1.1.4 , time >= 1.1.4
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
exposed-modules: Yesod.Sitemap exposed-modules: Yesod.Sitemap

47
yesod-static/yesod-static.cabal
View File

@ -1,5 +1,5 @@
name: yesod-static name: yesod-static
version: 0.3.2.1 version: 0.10.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -26,7 +26,7 @@ library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, containers >= 0.2 && < 0.5 , containers >= 0.2 && < 0.5
, old-time >= 1.0 , old-time >= 1.0
, yesod-core >= 0.9 && < 0.10 , yesod-core >= 0.10 && < 0.11
, base64-bytestring >= 0.1.0.1 && < 0.2 , base64-bytestring >= 0.1.0.1 && < 0.2
, pureMD5 >= 2.1.0.3 && < 2.2 , pureMD5 >= 2.1.0.3 && < 2.2
, cereal >= 0.3 && < 0.4 , cereal >= 0.3 && < 0.4
@ -34,43 +34,42 @@ library
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory >= 1.0 && < 1.2
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai-app-static >= 0.3.2.1 && < 0.4 , wai-app-static >= 1.0 && < 1.1
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, text >= 0.9 && < 0.12 , text >= 0.9 && < 1.0
, file-embed >= 0.0.4.1 && < 0.5 , file-embed >= 0.0.4.1 && < 0.5
, http-types >= 0.6.5 && < 0.7 , http-types >= 0.6.5 && < 0.7
, unix-compat >= 0.2 , unix-compat >= 0.2
, enumerator >= 0.4.8 && < 0.5
exposed-modules: Yesod.Static exposed-modules: Yesod.Static
ghc-options: -Wall ghc-options: -Wall
test-suite tests test-suite tests
hs-source-dirs: ., test hs-source-dirs: test
main-is: tests.hs main-is: tests.hs
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
cpp-options: -DTEST cpp-options: -DTEST
build-depends: build-depends:
hspec >= 0.8 && < 0.10 hspec >= 0.8 && < 0.10
, HUnit , HUnit
, yesod-static
-- copy from above -- copy from above
, base >= 4 && < 5 , base
, containers >= 0.2 && < 0.5 , containers
, old-time >= 1.0 , old-time
, yesod-core >= 0.9 && < 0.10 , yesod-core
, base64-bytestring >= 0.1.0.1 && < 0.2 , base64-bytestring
, pureMD5 >= 2.1.0.3 && < 2.2 , pureMD5
, cereal >= 0.3 && < 0.4 , cereal
, bytestring >= 0.9.1.4 && < 0.10 , bytestring
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory
, transformers >= 0.2.2 && < 0.3 , transformers
, wai-app-static >= 0.3.2.1 && < 0.4 , wai-app-static
, wai >= 0.4 && < 0.5 , wai
, text >= 0.9 && < 0.12 , text
, file-embed >= 0.0.4.1 && < 0.5 , file-embed
, http-types >= 0.6.5 && < 0.7 , http-types
, unix-compat >= 0.2 , unix-compat
, enumerator >= 0.4.8 && < 0.5
ghc-options: -Wall ghc-options: -Wall

9
yesod/Yesod.hs
View File

@ -1,5 +1,4 @@
{-# 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
@ -15,11 +14,7 @@ module Yesod
, Application , Application
, lift , lift
, liftIO , liftIO
#if MIN_VERSION_monad_control(0, 3, 0)
, MonadBaseControl , MonadBaseControl
#else
, MonadControlIO
#endif
-- * Utilities -- * Utilities
, showIntegral , showIntegral
, readIntegral , readIntegral
@ -54,11 +49,7 @@ import Network.Wai (Application)
import Network.Wai.Middleware.RequestLogger import Network.Wai.Middleware.RequestLogger
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
#if MIN_VERSION_monad_control(0, 3, 0)
import Control.Monad.Trans.Control (MonadBaseControl) import Control.Monad.Trans.Control (MonadBaseControl)
#else
import Control.Monad.IO.Control (MonadControlIO)
#endif
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import System.IO (stderr, hPutStrLn) import System.IO (stderr, hPutStrLn)

20
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 0.9.4.1 version: 0.10.0
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -71,19 +71,19 @@ library
cpp-options: -DGHC7 cpp-options: -DGHC7
else else
build-depends: base >= 4 && < 4.3 build-depends: base >= 4 && < 4.3
build-depends: yesod-core >= 0.9.3.4 && < 0.10 build-depends: yesod-core >= 0.10 && < 0.11
, yesod-auth >= 0.7 && < 0.8 , yesod-auth >= 0.8 && < 0.9
, yesod-json >= 0.2.2 && < 0.3 , yesod-json >= 0.3 && < 0.4
, yesod-persistent >= 0.2 && < 0.3 , yesod-persistent >= 0.3 && < 0.4
, yesod-form >= 0.3 && < 0.4 , yesod-form >= 0.4 && < 0.5
, monad-control >= 0.2 && < 0.4 , monad-control >= 0.3 && < 0.4
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai >= 0.4 && < 0.5 , wai >= 1.0 && < 1.1
, wai-extra >= 0.4.6 && < 0.5 , wai-extra >= 1.0 && < 1.1
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, shakespeare-css >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11
, warp >= 0.4 && < 0.5 , warp >= 1.0 && < 1.1
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
exposed-modules: Yesod exposed-modules: Yesod
ghc-options: -Wall ghc-options: -Wall