From a127b25e39c98f6115e0fe1c587798888b612a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20H=C3=A5klev?= Date: Tue, 2 Dec 2014 16:14:09 -0500 Subject: [PATCH] trying to make it compile/run --- AppleScript.cabal | 5 +++-- Foreign/AppleScript/Rich.hs | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AppleScript.cabal b/AppleScript.cabal index 3b60718..6bb0272 100644 --- a/AppleScript.cabal +++ b/AppleScript.cabal @@ -38,8 +38,9 @@ if os(darwin) { network < 2.4, conduit < 0.3, directory < 1.2, - template-haskell == 2.7.*, - mtl == 2.0.* + template-haskell >= 2.7, + mtl >= 2.0, + resourcet == 1.1.3 Exposed-modules: Foreign.AppleScript Foreign.AppleScript.Error diff --git a/Foreign/AppleScript/Rich.hs b/Foreign/AppleScript/Rich.hs index 3a59778..44f7789 100644 --- a/Foreign/AppleScript/Rich.hs +++ b/Foreign/AppleScript/Rich.hs @@ -7,7 +7,7 @@ TypeSynonymInstances, FlexibleInstances #-} -{-# OPTIONS_GHC -funbox-strict-fields -Wall -Werror #-} +{-# OPTIONS_GHC -funbox-strict-fields -Wall #-} -- | -- This module supports a \"rich\" communication with AppleScript. Specifically, this @@ -72,7 +72,7 @@ import qualified Foreign.AppleScript.Plain as Plain import Control.Applicative import Control.Monad.State import Control.Monad.Writer -import Control.Monad.Trans.Resource(ResourceT, runResourceT, withIO) +import Control.Monad.Trans.Resource(ResourceT, runResourceT, allocate) import Control.Exception(tryJust, finally) import Control.Concurrent(forkIO, killThread) @@ -276,11 +276,11 @@ runScriptFull conf script = runResourceT $ do -- start the callback server (_, sock) <- lift $ - withIO + allocate (listenOn (PortNumber port)) sClose -- (const $ return ()) - void $ lift $ withIO + void $ lift $ allocate (forkIO $ serverLoop handler sock) killThread