diff --git a/scaffold/.ghci.cg b/scaffold/.ghci.cg --- a/scaffold/.ghci.cg +++ b/scaffold/.ghci.cg @@ -1,1 +1,2 @@ :set -i.:config:dist/build/autogen +:set -XCPP -XTemplateHaskell -XQuasiQuotes -XTypeFamilies -XFlexibleContexts -XGADTs -XOverloadedStrings -XMultiParamTypeClasses -XGeneralizedNewtypeDeriving -XEmptyDataDecls diff --git a/scaffold/Application.hs.cg b/scaffold/Application.hs.cg --- a/scaffold/Application.hs.cg +++ b/scaffold/Application.hs.cg @@ -6,7 +6,6 @@ import Import import Settings -import Settings.StaticFiles (staticSite) import Yesod.Auth import Yesod.Default.Config import Yesod.Default.Main diff --git a/scaffold/Foundation.hs.cg b/scaffold/Foundation.hs.cg --- a/scaffold/Foundation.hs.cg +++ b/scaffold/Foundation.hs.cg @@ -15,7 +15,6 @@ import Prelude import Yesod import Yesod.Static -import Settings.StaticFiles import Yesod.Auth import Yesod.Auth.BrowserId import Yesod.Auth.GoogleEmail diff --git a/scaffold/Import.hs.cg b/scaffold/Import.hs.cg --- a/scaffold/Import.hs.cg +++ b/scaffold/Import.hs.cg @@ -2,9 +2,9 @@ ( module Prelude , module Yesod , module Foundation + , module Settings.StaticFiles , module Data.Monoid , module Control.Applicative - , module Settings.StaticFiles , Text #if __GLASGOW_HASKELL__ < 740 , (<>) diff --git a/yesod.cabal b/yesod.cabal --- a/yesod.cabal +++ b/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 0.10.1.3 +version: 0.10.1.4 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -101,7 +101,7 @@ cpp-options: -DWINDOWS build-depends: parsec >= 2.1 && < 4 , text >= 0.11 && < 0.12 - , shakespeare-text >= 0.10 && < 0.11 + , shakespeare-text >= 0.10 && < 0.12 , bytestring >= 0.9.1.4 && < 0.10 , time >= 1.1.4 , template-haskell