This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".

The branch, master has been updated
       via  788253e8fc9d29049e057d31bffba9ab477ee556 (commit)
       via  cd37807c5cceddecee3fb1fde01c48599ec1ae71 (commit)
       via  742a4e6c1c8c05308fc26efd63d292e5ac62b2c7 (commit)
      from  fac6ea0a778d3674e647806867b4fadc88b3c4d2 (commit)


Summary of changes:
 project_template/barebones/foo.cabal               |   13 ++--
 project_template/{extensions => default}/foo.cabal |   17 ++--
 .../{extensions => default}/log/access.log         |    0
 .../{extensions => default}/log/error.log          |    0
 .../resources/static/screen.css                    |    0
 .../resources/templates/echo.tpl                   |    0
 .../resources/templates/index.tpl                  |    0
 .../{extensions => default}/src/Application.hs     |    0
 .../{extensions => default}/src/Main.hs            |    0
 .../{extensions => default}/src/Site.hs            |    0
 project_template/hint/foo.cabal                    |   40 ----------
 project_template/hint/resources/static/screen.css  |   26 ------
 project_template/hint/resources/templates/echo.tpl |   14 ----
 .../hint/resources/templates/index.tpl             |   33 --------
 project_template/hint/src/AppState.hs              |   70 ----------------
 project_template/hint/src/Main.hs                  |   83 --------------------
 project_template/hint/src/Site.hs                  |   75 ------------------
 snap.cabal                                         |   51 ++++++++-----
 src/Snap/Starter.hs                                |   17 ++---
 19 files changed, 52 insertions(+), 387 deletions(-)
 rename project_template/{extensions => default}/foo.cabal (75%)
 rename project_template/{extensions => default}/log/access.log (100%)
 rename project_template/{extensions => default}/log/error.log (100%)
 rename project_template/{extensions => default}/resources/static/screen.css 
(100%)
 rename project_template/{extensions => default}/resources/templates/echo.tpl 
(100%)
 rename project_template/{extensions => default}/resources/templates/index.tpl 
(100%)
 rename project_template/{extensions => default}/src/Application.hs (100%)
 rename project_template/{extensions => default}/src/Main.hs (100%)
 rename project_template/{extensions => default}/src/Site.hs (100%)
 delete mode 100644 project_template/hint/foo.cabal
 delete mode 100644 project_template/hint/log/access.log
 delete mode 100644 project_template/hint/log/error.log
 delete mode 100644 project_template/hint/resources/static/screen.css
 delete mode 100644 project_template/hint/resources/templates/echo.tpl
 delete mode 100644 project_template/hint/resources/templates/index.tpl
 delete mode 100644 project_template/hint/src/AppState.hs
 delete mode 100644 project_template/hint/src/Main.hs
 delete mode 100644 project_template/hint/src/Site.hs

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 788253e8fc9d29049e057d31bffba9ab477ee556
Merge: fac6ea0 cd37807
Author: Gregory Collins <[email protected]>
Date:   Sun Dec 5 22:45:12 2010 +0100

    Merge branch 'enumerator'

commit cd37807c5cceddecee3fb1fde01c48599ec1ae71
Author: Gregory Collins <[email protected]>
Date:   Sun Dec 5 22:44:47 2010 +0100

    Fold in duairc's extensions code, kill hint-only project template, move to 
enumerator

diff --git a/project_template/barebones/foo.cabal 
b/project_template/barebones/foo.cabal
index a61c523..48ca101 100644
--- a/project_template/barebones/foo.cabal
+++ b/project_template/barebones/foo.cabal
@@ -15,18 +15,17 @@ Executable projname
   main-is: Main.hs
 
   Build-depends:
+    MonadCatchIO-transformers,
     base >= 4,
-    haskell98,
-    monads-fd >= 0.1 && <0.2,
     bytestring >= 0.9.1 && <0.10,
+    containers,
+    filepath >= 1.1 && <1.2,
+    haskell98,
+    mtl >= 2 && <3,
     snap-core >= 0.2 && <0.3,
     snap-server >= 0.2 && <0.3,
-    xhtml-combinators,
-    unix,
     text,
-    containers,
-    MonadCatchIO-transformers,
-    filepath >= 1.1 && <1.2
+    unix
 
   if impl(ghc >= 6.12.0)
     ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
diff --git a/project_template/extensions/foo.cabal 
b/project_template/default/foo.cabal
similarity index 75%
rename from project_template/extensions/foo.cabal
rename to project_template/default/foo.cabal
index 466298e..125270f 100644
--- a/project_template/extensions/foo.cabal
+++ b/project_template/default/foo.cabal
@@ -10,27 +10,26 @@ Category:            Web
 Build-type:          Simple
 Cabal-version:       >=1.2
 
-Flag production
-  Description: Whether to build the server in production (static loading) mode
+Flag development
+  Description: Whether to build the server in development (interpreted) mode
   Default: False
 
 Executable foo
   hs-source-dirs: src
   main-is: Main.hs
 
-  if flag(production)
+  if !flag(development)
     cpp-options: -DPRODUCTION
+    build-depends: hint >= 0.3.2 && < 0.4
 
   Build-depends:
+    MonadCatchIO-transformers >= 0.2.1 && < 0.3,
     base >= 4 && < 5,
     bytestring >= 0.9.1 && < 0.10,
-    MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-    monads-fd >= 0.1 && < 0.2,
+    heist >= 0.3 && <0.4,
+    mtl >= 2 && <3,
     snap >= 0.3 && < 0.4,
-    snap-core >= 0.3 && < 0.4,
-    snap-extensions >= 0.1 && < 0.2,
-    heist >= 0.2.4 && < 0.3,
-    hint >= 0.3.2 && < 0.4
+    snap-core >= 0.3 && < 0.4
 
   if impl(ghc >= 6.12.0)
     ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
diff --git a/project_template/extensions/log/access.log 
b/project_template/default/log/access.log
similarity index 100%
rename from project_template/extensions/log/access.log
rename to project_template/default/log/access.log
diff --git a/project_template/extensions/log/error.log 
b/project_template/default/log/error.log
similarity index 100%
rename from project_template/extensions/log/error.log
rename to project_template/default/log/error.log
diff --git a/project_template/extensions/resources/static/screen.css 
b/project_template/default/resources/static/screen.css
similarity index 100%
rename from project_template/extensions/resources/static/screen.css
rename to project_template/default/resources/static/screen.css
diff --git a/project_template/extensions/resources/templates/echo.tpl 
b/project_template/default/resources/templates/echo.tpl
similarity index 100%
rename from project_template/extensions/resources/templates/echo.tpl
rename to project_template/default/resources/templates/echo.tpl
diff --git a/project_template/extensions/resources/templates/index.tpl 
b/project_template/default/resources/templates/index.tpl
similarity index 100%
rename from project_template/extensions/resources/templates/index.tpl
rename to project_template/default/resources/templates/index.tpl
diff --git a/project_template/extensions/src/Application.hs 
b/project_template/default/src/Application.hs
similarity index 100%
rename from project_template/extensions/src/Application.hs
rename to project_template/default/src/Application.hs
diff --git a/project_template/extensions/src/Main.hs 
b/project_template/default/src/Main.hs
similarity index 100%
rename from project_template/extensions/src/Main.hs
rename to project_template/default/src/Main.hs
diff --git a/project_template/extensions/src/Site.hs 
b/project_template/default/src/Site.hs
similarity index 100%
rename from project_template/extensions/src/Site.hs
rename to project_template/default/src/Site.hs
diff --git a/project_template/hint/foo.cabal b/project_template/hint/foo.cabal
deleted file mode 100644
index 8c206ff..0000000
--- a/project_template/hint/foo.cabal
+++ /dev/null
@@ -1,40 +0,0 @@
-Name:                projname
-Version:             0.1
-Synopsis:            Project Synopsis Here
-Description:         Project Description Here
-License:             AllRightsReserved
-Author:              Author
-Maintainer:          [email protected]
-Stability:           Experimental
-Category:            Web
-Build-type:          Simple
-Cabal-version:       >=1.2
-
-Flag production
-  Description: Whether to build the server in production (static loading) mode
-  Default: False
-
-Executable projname
-  hs-source-dirs: src
-  main-is: Main.hs
-
-  if flag(production)
-    cpp-options:             -DPRODUCTION
-
-  Build-depends:
-    base >= 4 && < 5,
-    bytestring >= 0.9.1 && < 0.10,
-    MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-    monads-fd >= 0.1 && < 0.2,
-    snap >= 0.3 && < 0.4,
-    snap-core >= 0.3 && < 0.4,
-    snap-server >= 0.3 && < 0.4,
-    heist >= 0.2.4 && < 0.3,
-    hint >= 0.3.2 && < 0.4,
-    time >= 1.0 && < 1.3
-
-  if impl(ghc >= 6.12.0)
-    ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
-                 -fno-warn-unused-do-bind
-  else
-    ghc-options: -threaded -Wall -fwarn-tabs -funbox-strict-fields -O2
diff --git a/project_template/hint/log/access.log 
b/project_template/hint/log/access.log
deleted file mode 100644
index e69de29..0000000
diff --git a/project_template/hint/log/error.log 
b/project_template/hint/log/error.log
deleted file mode 100644
index e69de29..0000000
diff --git a/project_template/hint/resources/static/screen.css 
b/project_template/hint/resources/static/screen.css
deleted file mode 100644
index b052609..0000000
--- a/project_template/hint/resources/static/screen.css
+++ /dev/null
@@ -1,26 +0,0 @@
-html {
-   padding: 0;
-   margin: 0;
-   background-color: #ffffff;
-   font-family: Verdana, Helvetica, sans-serif;
-}
-body {
-   padding: 0;
-   margin: 0;
-}
-a {
-   text-decoration: underline;
-}
-a :hover {
-   cursor: pointer;
-   text-decoration: underline;
-}
-img {
-   border: none;
-}
-#content {
-   padding-left: 1em;
-}
-#info {
-   font-size: 60%;
-}
diff --git a/project_template/hint/resources/templates/echo.tpl 
b/project_template/hint/resources/templates/echo.tpl
deleted file mode 100644
index a9a3181..0000000
--- a/project_template/hint/resources/templates/echo.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-  <head>
-    <title>Echo Page</title>
-  </head>
-  <body>
-    <div id="content">
-      <h1>Is there an echo in here?</h1>
-    </div>
-    <p>You wanted me to say this?</p>
-    <p>"<message/>"</p>
-    <p><a href="/">Return</a></p>
-  </body>
-</html>
diff --git a/project_template/hint/resources/templates/index.tpl 
b/project_template/hint/resources/templates/index.tpl
deleted file mode 100644
index c643d16..0000000
--- a/project_template/hint/resources/templates/index.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";>
-  <head>
-    <title>Snap web server</title>
-    <link rel="stylesheet" type="text/css" href="screen.css"/>
-  </head>
-  <body>
-    <div id="content">
-      <h1>It works!</h1>
-      <p>
-        This is a simple demo page served using
-        <a href="http://snapframework.com/docs/tutorials/heist";>Heist</a>
-        and the <a href="http://snapframework.com/";>Snap</a> web framework.
-      </p>
-      <p>
-        Echo test:
-        <a href="/echo/cats">cats</a>
-        <a href="/echo/dogs">dogs</a>
-        <a href="/echo/fish">fish</a>
-      </p>
-      <table id="info">
-        <tr>
-          <td>Config generated at:</td>
-          <td><loadTime/></td>
-        </tr>
-        <tr>
-          <td>Page generated at:</td>
-          <td><renderTime/></td>
-        </tr>
-      </table>
-    </div>
-  </body>
-</html>
diff --git a/project_template/hint/src/AppState.hs 
b/project_template/hint/src/AppState.hs
deleted file mode 100644
index dd92d1f..0000000
--- a/project_template/hint/src/AppState.hs
+++ /dev/null
@@ -1,70 +0,0 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-
--- This module contains site-specific state information.
-module AppState (
-    AppState(..)
-  , loadAppState
-  , cleanupAppState
-  , StateSnap
-  , runStateSnap
-  , ask  -- these functions are re-exported
-  , asks -- from Control.Monad.Reader
-)
-where
-
-import Control.Applicative
-import Control.Monad.CatchIO
-import Control.Monad.Reader
-
-import Data.Time.Clock
-import Snap.Types
-import Text.Templating.Heist
-
-
--- This contains the site configuration.  Being a boring sample site,
--- this is just a boring sample configuration.  It has the load time
--- (to help illustrate config loading differences between development
--- and production modes) and the TemplateState used for rendering
--- Heist templates.
-data AppState = AppState {
-      loadTime :: UTCTime
-    , templateState :: TemplateState StateSnap
-    }
-
-
--- An example of creating an application-specific MonadSnap instance.
--- This instance uses the GeneralizedNewtypeDeriving extension to
--- derive all the necessary instances from the underlying
--- representation.
-newtype StateSnap a = AS (ReaderT AppState Snap a)
-    deriving ( Monad
-             , MonadReader AppState
-             , MonadSnap
-             , MonadPlus
-             , MonadCatchIO
-             , MonadIO
-             , Applicative
-             , Alternative
-             , Functor
-             )
-
-
--- Convert the application-specific MonadSnap instance into a Snap
--- type.
-runStateSnap :: StateSnap a -> AppState -> Snap a
-runStateSnap (AS rt) st = runReaderT rt st
-
-
--- loads the heist TemplateState, and gets the current time.
-loadAppState :: IO AppState
-loadAppState = do
-    time <- getCurrentTime
-    let ets = loadTemplates "resources/templates" emptyTemplateState
-    either error (AppState time) <$> ets
-
-
--- Doesn't actually do anything.  This is a placeholder for tasks like
--- releasing database connections, or cleaning up anything else that
--- might have been included in the config.
-cleanupAppState :: AppState -> IO ()
-cleanupAppState _ = return ()
diff --git a/project_template/hint/src/Main.hs 
b/project_template/hint/src/Main.hs
deleted file mode 100644
index 47e541b..0000000
--- a/project_template/hint/src/Main.hs
+++ /dev/null
@@ -1,83 +0,0 @@
-{-# LANGUAGE CPP, TemplateHaskell #-}
-module Main where
-
-import           AppState
-import           Site
-import           Snap.Http.Server
-#ifdef PRODUCTION
-import           Snap.Loader.Static
-#else
-import           Snap.Loader.Hint
-#endif
-
--- This is the entry point for this web server application.  It
--- supports easily switching between interpreting source and running
--- statically compiled code.
---
--- In either mode, the generated program should be run from the root
--- of the project tree.  It locates its templates, static content, and
--- source files in development mode, relative to the current working
--- directory when it is run.
---
--- When compiled without the production flag, only changes to the
--- libraries, your cabal file, or this file should require a recompile
--- to be picked up.  Everything else is interpreted at runtime.  There
--- are a few consequences of this.
---
--- First, this is much slower.  Running the interpreter seems to take
--- about 300ms on my system, regardless of the simplicity of the
--- loaded code.  The results of the interpreter process are cached for
--- a few seconds, to hopefully ensure that the the interpreter is only
--- invoked once for each load of a page and the resources it depends
--- on.
---
--- Second, the generated server binary is MUCH larger, since it links
--- in the GHC API (via the hint library).
---
--- Third, it results in loadAppState/cleanupAppState being called for
--- each request.  This is to ensure that the current state is
--- compatible with the running action.  If your application state
--- takes a long time to load or clean up, the penalty will be visible.
---
--- Fourth, and the reason you would ever want to actually compile
--- without production mode, is that it enables a *much* faster
--- development cycle.  You can simply edit a file, save your changes,
--- and hit reload to see your changes reflected immediately.
---
--- When this is compiled with the production flag, all the actions are
--- statically compiled in.  This results in much faster execution, a
--- smaller binary size, only running load and cleanup once per
--- application run, and having to recompile the server for any code
--- change.
-main :: IO ()
-main = do
-    -- This is just about the same as calling a function:
-    --
-    -- loadSnap :: IO a
-    --          -> (a -> IO ())
-    --          -> (a -> Snap ())
-    --          -> IO (IO (), Snap ())
-    --
-    -- The important parts are that it gives you back a cleanup action
-    -- and a Snap handler.  The specific behavior of each depends on
-    -- whether the Hint loader or the Static loader is imported.  This
-    -- interface abstracts across the differences between them.
-    --
-    -- The most significant behavioral differences between the two
-    -- loaders are how the action is determined, and when the
-    -- loadAppState and cleanupAppState functions are executed.
-    --
-    -- The Hint loader uses the ghc api to interpret the sources when
-    -- pages are loaded.  It also runs loadAppState and
-    -- cleanupAppState for each request it handles.
-    --
-    -- The Static loader compiles all the actions when the app is
-    -- compiled.  It runs loadAppState once, at the start of the
-    -- program, and cleanupAppState once, at the end of the program.
-    (cleanup, snap) <- $(loadSnapTH 'loadAppState 'cleanupAppState 'site)
-
-    -- Run the server
-    quickHttpServe snap
-
-    -- Run the cleanup action before exiting
-    cleanup
diff --git a/project_template/hint/src/Site.hs 
b/project_template/hint/src/Site.hs
deleted file mode 100644
index c7070cb..0000000
--- a/project_template/hint/src/Site.hs
+++ /dev/null
@@ -1,75 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Site where
-
-------------------------------------------------------------------------------
-import           AppState
-
-import           Control.Applicative
-import           Control.Arrow
-import           Control.Monad.Trans
-
-import qualified Data.ByteString.Char8 as S
-import           Data.Maybe
-import           Data.Time.Clock
-
-import           Snap.Heist
-
-import           Snap.Util.FileServe
-import           Snap.Types
-
-import           Text.Templating.Heist
-
-
-------------------------------------------------------------------------------
--- Renders the front page of the sample site.
---
--- The 'ifTop' is required to limit this to the top of a route.
--- Otherwise, the way the route table is currently set up, this action
--- would be given every request.
-frontPage :: StateSnap ()
-frontPage = ifTop $ do
-    time <- liftIO getCurrentTime
-    (ts, lt) <- asks (templateState &&& loadTime)
-
-    let [loadS, renderS] = map (S.pack . show) [lt, time]
-        ts' = bindStrings [ ("loadTime", loadS)
-                          , ("renderTime", renderS)
-                          ] ts
-    renderHtml ts' "index"
-
-
-------------------------------------------------------------------------------
--- Renders the echo page
-echo :: StateSnap ()
-echo = do
-    message <- fromMaybe "" <$> getParam "stuff"
-    ts <- asks templateState
-    let message' = fromMaybe message $ urlDecode message
-        ts' = bindStrings [ ("message", message') ] ts
-    renderHtml ts' "echo"
-
-
-------------------------------------------------------------------------------
--- serves static resources
-staticResources :: StateSnap ()
-staticResources = fileServe "resources/static"
-
-
-------------------------------------------------------------------------------
--- contains the routing table.  Be aware that routes are prefix
--- matches.  The 'frontPage' action contains logic to only render if
--- it's served from exactly "/"
-routes :: StateSnap ()
-routes = route
-         [ ("/", frontPage)
-         , ("/echo/:stuff", echo)
-         ]
-
-
-------------------------------------------------------------------------------
--- The main entry point handler.  It converts from StateSnap to Snap,
--- and sets the first-pass resolution rules.  In particular, the logic
--- that static resources take priority over routes comes from this
--- function.
-site :: AppState -> Snap ()
-site = runStateSnap $ staticResources <|> routes
diff --git a/snap.cabal b/snap.cabal
index a3669e8..5667ec8 100644
--- a/snap.cabal
+++ b/snap.cabal
@@ -19,36 +19,51 @@ extra-source-files:
   project_template/barebones/foo.cabal,
   project_template/barebones/src/Main.hs,
   project_template/barebones/src/Server.hs,
+  project_template/default,
   project_template/default/foo.cabal,
-  project_template/default/src/Glue.hs,
+  project_template/default/log,
+  project_template/default/log/access.log,
+  project_template/default/log/error.log,
+  project_template/default/resources,
+  project_template/default/resources/static,
+  project_template/default/resources/static/screen.css,
+  project_template/default/resources/templates,
+  project_template/default/resources/templates/echo.tpl,
+  project_template/default/resources/templates/index.tpl,
+  project_template/default/src,
+  project_template/default/src/Application.hs,
   project_template/default/src/Main.hs,
-  project_template/default/src/Server.hs,
-  project_template/hint/foo.cabal,
-  project_template/hint/log/access.log,
-  project_template/hint/log/error.log,
-  project_template/hint/resources/static/screen.css,
-  project_template/hint/resources/templates/echo.tpl,
-  project_template/hint/resources/templates/index.tpl,
-  project_template/hint/src/AppState.hs,
-  project_template/hint/src/Main.hs,
-  project_template/hint/src/Site.hs
-
+  project_template/default/src/Site.hs,
+  project_template/default/src/Snap,
+  project_template/default/src/Snap/Extension,
+  project_template/default/src/Snap/Extension/Timer,
+  project_template/default/src/Snap/Extension/Timer/Timer.hs,
+  project_template/default/src/Snap/Extension/Timer.hs
+  
 Library
   hs-source-dirs: src
 
   exposed-modules:
+    Snap.Extension.Heist,
+    Snap.Extension.Server.Hint,
+    Snap.Extension.Server,
+    Snap.Extension,
     Snap.Heist,
-    Snap.Loader.Static,
-    Snap.Loader.Hint
+    Snap.Loader.Hint,
+    Snap.Loader.Static
+
+  other-modules:
+    Snap.Extension.Heist.Heist
 
   build-depends:
     base >= 4 && < 5,
     bytestring >= 0.9.1 && < 0.10,
     directory >= 1.0.0.0 && < 1.1,
+    enumerator == 0.4.*,
     filepath >= 1.0 && < 1.2,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
     snap-core == 0.3.*,
-    heist >= 0.2.5 && < 0.3,
+    heist >= 0.3 && < 0.4,
     hint >= 0.3.3.1 && < 0.4,
     template-haskell >= 2.3 && < 2.5,
     time >= 1.0 && < 1.3
diff --git a/src/Snap/Starter.hs b/src/Snap/Starter.hs
index 7362bd2..4a2b9ff 100644
--- a/src/Snap/Starter.hs
+++ b/src/Snap/Starter.hs
@@ -16,9 +16,8 @@ import Snap.StarterTH
 
 ------------------------------------------------------------------------------
 -- Creates a value tDir :: ([String], [(String, String)])
-$(buildData "tDirBareBones"  "barebones")
-$(buildData "tDirHint"       "hint")
-$(buildData "tDirExtensions" "extensions")
+$(buildData "tDirBareBones" "barebones")
+$(buildData "tDirDefault"   "default")
 
 ------------------------------------------------------------------------------
 usage :: String
@@ -37,7 +36,6 @@ usage = unlines
 ------------------------------------------------------------------------------
 data InitFlag = InitBareBones
               | InitHelp
-              | InitHint
               | InitExtensions
   deriving (Show, Eq)
 
@@ -76,10 +74,8 @@ initProject args = do
                  "Depend only on -core and -server"
         , Option ['h'] ["help"]       (NoArg InitHelp)
                  "Print this message"
-        , Option ['i'] ["hint"]       (NoArg InitHint)
-                 "Depend on hint (default)"
         , Option ['e'] ["extensions"] (NoArg InitExtensions)
-                 "Depend on hint and snap-extensions"
+                 "Depend on snap w/ extensions (default)"
         ]
 
     init' flags = do
@@ -88,10 +84,9 @@ initProject args = do
             projName = last dirs
             setup' = setup projName
         case flags of
-          (_:_) | InitHint       `elem` flags -> setup' tDirHint
-                | InitBareBones  `elem` flags -> setup' tDirBareBones
-                | InitExtensions `elem` flags -> setup' tDirExtensions
-          _                                   -> setup' tDirHint
+          (_:_) | InitBareBones  `elem` flags -> setup' tDirBareBones
+                | InitExtensions `elem` flags -> setup' tDirDefault
+          _                                   -> setup' tDirDefault
 
 
 ------------------------------------------------------------------------------
commit 742a4e6c1c8c05308fc26efd63d292e5ac62b2c7
Author: Gregory Collins <[email protected]>
Date:   Sat Dec 4 12:52:18 2010 +0100

    Switch snap to enumerator, upgrade to mtl-2

diff --git a/snap.cabal b/snap.cabal
index 9ed6dd7..a3669e8 100644
--- a/snap.cabal
+++ b/snap.cabal
@@ -47,7 +47,6 @@ Library
     directory >= 1.0.0.0 && < 1.1,
     filepath >= 1.0 && < 1.2,
     MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-    monads-fd >= 0.1 && < 0.2,
     snap-core == 0.3.*,
     heist >= 0.2.5 && < 0.3,
     hint >= 0.3.3.1 && < 0.4,
@@ -76,10 +75,10 @@ Executable snap
     directory,
     directory-tree,
     dlist >= 0.5 && < 0.6,
+    enumerator == 0.4.*,
     filepath,
     haskell98,
-    iteratee >= 0.3.1 && <0.4,
-    monads-fd,
+    mtl >= 2,
     old-locale,
     old-time,
     snap-core == 0.3.*,
@@ -87,7 +86,6 @@ Executable snap
     template-haskell,
     text >= 0.10 && <0.11,
     time,
-    transformers,
     unix-compat,
     zlib
 
-----------------------------------------------------------------------


hooks/post-receive
-- 
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap

Reply via email to