Permalink
Browse files

Compile with latest snap.

  • Loading branch information...
1 parent 1c18273 commit 3d5df655b4ba48ef77d4ea4cffc2acbb7eb8ddb4 @acowley committed Feb 4, 2013
Showing with 9 additions and 10 deletions.
  1. +1 −1 Ros/Core/Msg/Parse.hs
  2. +0 −1 Ros/Core/RosTypes.hs
  3. +3 −3 Ros/SlaveAPI.hs
  4. +5 −5 roshask.cabal
View
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings, TupleSections #-}
module Ros.Core.Msg.Parse (parseMsg, simpleFieldAssoc) where
import Prelude hiding (takeWhile)
-import Control.Applicative hiding (many)
+import Control.Applicative
import Control.Arrow ((***), (&&&))
import Data.Attoparsec.Char8
import Data.ByteString (ByteString)
View
@@ -2,7 +2,6 @@
module Ros.Core.RosTypes (ROSTime, ROSDuration, URI, CallerID, TopicName,
NodeName, ParamName, TopicType, ConnectionID) where
import Data.Word (Word32)
-import Foreign.Storable.Tuple ()
type URI = String
type CallerID = String
View
@@ -9,7 +9,7 @@ import Control.Monad.IO.Class (liftIO)
import qualified Data.ByteString.UTF8 ()
import qualified Data.ByteString.Lazy.UTF8 as BLU
import Snap.Http.Server (simpleHttpServe)
-import Snap.Http.Server.Config (defaultConfig, setPort, Config,
+import Snap.Http.Server.Config (defaultConfig, setPort, Config, ConfigLog(..),
setVerbose, setAccessLog, setErrorLog)
import Snap.Types (Snap, getRequestBody, writeLBS,
getResponse, putResponse, setContentLength)
@@ -162,8 +162,8 @@ slaveRPC n = -- \q s -> putStrLn ("Slave call "++s)>>(handleCall (dispatch q) s)
simpleServe :: Int -> Snap () -> IO ()
simpleServe port handler = simpleHttpServe conf handler
where conf :: Config Snap ()
- conf = setAccessLog Nothing .
- setErrorLog Nothing .
+ conf = setAccessLog ConfigNoLog .
+ setErrorLog ConfigNoLog .
setVerbose False .
setPort port $
defaultConfig
View
@@ -96,7 +96,7 @@ Library
Build-depends: template-haskell
-- Packages needed in order to build this package.
- Build-depends: base >= 4 && < 6,
+ Build-depends: base >= 4.5 && < 6,
binary,
bytestring,
containers,
@@ -108,8 +108,8 @@ Library
BoundedChan >= 1.0.0.2,
parsec >= 3.1,
process >= 1.0.1.3,
- snap-core == 0.5.*,
- snap-server == 0.5.*,
+ snap-core >= 0.9,
+ snap-server >= 0.9,
storable-tuple >= 0.0.2,
transformers >= 0.2,
haxr >= 3000.8.3,
@@ -138,8 +138,8 @@ Executable roshask
Build-Depends: base >= 4.2 && < 6,
bytestring,
containers,
- mtl == 2.*,
- vector == 0.7.*,
+ mtl >= 2,
+ vector >= 0.10,
binary,
filepath > 1.1,
attoparsec > 0.8,

0 comments on commit 3d5df65

Please sign in to comment.