git.iko.soy/typeable/wai
on master help sign in
wai-handler-devel: Compatibility with GHC 7.6.1 / directory-1.2.0
3349747Simon Hengel
wai-handler-devel/.ghcinew file+1
compare with master
unifiedsplit
@@ -0,0 +1 @@
1+:set -optP-include -optPdist/build/autogen/cabal_macros.h
wai-handler-devel/Network/Wai/Handler/DevelServer.hs+5−5
@@ -25,13 +25,13 @@ import Data.Maybe
25import Control.Monad
25import Control.Monad
26import Control.Concurrent.MVar
26import Control.Concurrent.MVar
27
27
28−import System.Directory (getModificationTime)
29import qualified Network.Wai.Handler.Warp as Warp
28import qualified Network.Wai.Handler.Warp as Warp
30import Network.Wai.Application.Devel
29import Network.Wai.Application.Devel
31import Network.Wai.Middleware.RequestLogger (logStdoutDev)
30import Network.Wai.Middleware.RequestLogger (logStdoutDev)
32
31
33import Data.List (nub, group, sort)
32import Data.List (nub, group, sort)
34−import System.Time (ClockTime)
33+
34+import Network.Wai.Handler.DevelServer.Compat
35
35
36type FunctionName = String
36type FunctionName = String
37
37
@@ -98,8 +98,8 @@ startApp queue withApp = do
98 void x = x >> return ()
98 void x = x >> return ()
99-}
99-}
100
100
101−getTimes :: [FilePath] -> IO [ClockTime]
101+getTimes :: [FilePath] -> IO [TimeStamp]
102−getTimes = E.handle (constSE $ return []) . mapM getModificationTime
102+getTimes = E.handle (constSE $ return []) . mapM getTimeStamp
103
103
104constSE :: x -> SomeException -> x
104constSE :: x -> SomeException -> x
105constSE = const
105constSE = const
@@ -129,7 +129,7 @@ reload :: String -> String
129 -> Maybe SomeException
129 -> Maybe SomeException
130 -> AppHolder
130 -> AppHolder
131 -> [IO ()]
131 -> [IO ()]
132− -> IO (Maybe SomeException, [(FilePath, ClockTime)])
132+ -> IO (Maybe SomeException, [(FilePath, TimeStamp)])
133reload modu func extras prevError ah actions = do
133reload modu func extras prevError ah actions = do
134 case prevError of
134 case prevError of
135 Nothing -> putStrLn "Attempting to interpret your app..."
135 Nothing -> putStrLn "Attempting to interpret your app..."
wai-handler-devel/Network/Wai/Handler/DevelServer/Compat.hsnew file+19
@@ -0,0 +1,19 @@
1+{-# LANGUAGE CPP #-}
2+module Network.Wai.Handler.DevelServer.Compat (
3+ TimeStamp
4+, getTimeStamp
5+) where
6+
7+import System.Directory (getModificationTime)
8+
9+#if MIN_VERSION_directory(1,2,0)
10+import Data.Time.Clock (UTCTime)
11+newtype TimeStamp = TimeStamp UTCTime
12+#else
13+import System.Time (ClockTime)
14+newtype TimeStamp = TimeStamp ClockTime
15+#endif
16+ deriving Eq
17+
18+getTimeStamp :: FilePath -> IO TimeStamp
19+getTimeStamp = fmap TimeStamp . getModificationTime
wai-handler-devel/wai-handler-devel.cabal+2
@@ -32,10 +32,12 @@ Library
32 , hint >= 0.3.2.3 && < 0.4
32 , hint >= 0.3.2.3 && < 0.4
33 , text >= 0.7
33 , text >= 0.7
34 , old-time
34 , old-time
35+ , time
35 , transformers >= 0.2.2
36 , transformers >= 0.2.2
36 , attoparsec >= 0.10
37 , attoparsec >= 0.10
37 Exposed-modules: Network.Wai.Handler.DevelServer
38 Exposed-modules: Network.Wai.Handler.DevelServer
38 Network.Wai.Application.Devel
39 Network.Wai.Application.Devel
40+ Other-modules: Network.Wai.Handler.DevelServer.Compat
39 ghc-options: -Wall
41 ghc-options: -Wall
40
42
41Executable wai-handler-devel
43Executable wai-handler-devel