GHC 6.12 fixes
This commit is contained in:
parent
ac74e83e4b
commit
be372022ec
@ -2,6 +2,7 @@
|
|||||||
{-# LANGUAGE QuasiQuotes #-}
|
{-# LANGUAGE QuasiQuotes #-}
|
||||||
{-# LANGUAGE TemplateHaskell #-}
|
{-# LANGUAGE TemplateHaskell #-}
|
||||||
{-# LANGUAGE ScopedTypeVariables #-}
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
module Devel
|
module Devel
|
||||||
( devel
|
( devel
|
||||||
) where
|
) where
|
||||||
@ -35,6 +36,12 @@ import Text.Shakespeare.Text (st)
|
|||||||
|
|
||||||
import Build (recompDeps, getDeps,findHaskellFiles)
|
import Build (recompDeps, getDeps,findHaskellFiles)
|
||||||
|
|
||||||
|
#if __GLASGOW_HASKELL__ >= 700
|
||||||
|
#define ST st
|
||||||
|
#else
|
||||||
|
#define ST $st
|
||||||
|
#endif
|
||||||
|
|
||||||
lockFile :: FilePath
|
lockFile :: FilePath
|
||||||
lockFile = "dist/devel-terminate"
|
lockFile = "dist/devel-terminate"
|
||||||
|
|
||||||
@ -137,7 +144,7 @@ showPkgName :: D.PackageId -> String
|
|||||||
showPkgName = (\(D.PackageName n) -> n) . D.pkgName
|
showPkgName = (\(D.PackageName n) -> n) . D.pkgName
|
||||||
|
|
||||||
develFile :: D.PackageId -> T.Text
|
develFile :: D.PackageId -> T.Text
|
||||||
develFile pid = [st|
|
develFile pid = [ST|
|
||||||
{-# LANGUAGE PackageImports #-}
|
{-# LANGUAGE PackageImports #-}
|
||||||
import "#{showPkgName pid}" Application (withDevelAppPort)
|
import "#{showPkgName pid}" Application (withDevelAppPort)
|
||||||
import Data.Dynamic (fromDynamic)
|
import Data.Dynamic (fromDynamic)
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
name: yesod
|
name: yesod
|
||||||
version: 0.9.2.1
|
version: 0.9.2.2
|
||||||
license: BSD3
|
license: BSD3
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Michael Snoyman <michael@snoyman.com>
|
author: Michael Snoyman <michael@snoyman.com>
|
||||||
@ -100,7 +100,7 @@ executable yesod
|
|||||||
, attoparsec-text >= 0.8.5 && < 0.9
|
, attoparsec-text >= 0.8.5 && < 0.9
|
||||||
, http-types >= 0.6.1 && < 0.7
|
, http-types >= 0.6.1 && < 0.7
|
||||||
, blaze-builder >= 0.2 && < 0.4
|
, blaze-builder >= 0.2 && < 0.4
|
||||||
, filepath >= 1.2 && < 1.3
|
, filepath >= 1.1 && < 1.3
|
||||||
, process
|
, process
|
||||||
ghc-options: -Wall -threaded
|
ghc-options: -Wall -threaded
|
||||||
main-is: main.hs
|
main-is: main.hs
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user