From be372022ec6cee4c2994ab3b73cf022c65a2aaec Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Sep 2011 07:11:44 +0300
Subject: [PATCH] GHC 6.12 fixes

---
 yesod/Devel.hs    | 9 ++++++++-
 yesod/yesod.cabal | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yesod/Devel.hs b/yesod/Devel.hs
index 88e214bd..03d8795f 100755
--- a/yesod/Devel.hs
+++ b/yesod/Devel.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE QuasiQuotes         #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP                 #-}
 module Devel
     ( devel
     ) where
@@ -35,6 +36,12 @@ import Text.Shakespeare.Text (st)
 
 import Build (recompDeps, getDeps,findHaskellFiles)
 
+#if __GLASGOW_HASKELL__ >= 700
+#define ST st
+#else
+#define ST $st
+#endif
+
 lockFile :: FilePath
 lockFile = "dist/devel-terminate"
 
@@ -137,7 +144,7 @@ showPkgName :: D.PackageId -> String
 showPkgName = (\(D.PackageName n) -> n) . D.pkgName
 
 develFile :: D.PackageId -> T.Text
-develFile pid = [st|
+develFile pid = [ST|
 {-# LANGUAGE PackageImports #-}
 import "#{showPkgName pid}" Application (withDevelAppPort)
 import Data.Dynamic (fromDynamic)
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 94a340d4..9b13dcdf 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         0.9.2.1
+version:         0.9.2.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -100,7 +100,7 @@ executable             yesod
                      , attoparsec-text    >= 0.8.5        && < 0.9
                      , http-types         >= 0.6.1        && < 0.7
                      , blaze-builder      >= 0.2          && < 0.4
-                     , filepath           >= 1.2          && < 1.3
+                     , filepath           >= 1.1          && < 1.3
                      , process
     ghc-options:       -Wall -threaded
     main-is:           main.hs