adjust to build with monad-control-0.3

I had to, I hope temporarily, lose my nice Annex newtype, and use a type
synonym. This because I cannot find a way to derive a MonadBaseControl
instance of the Annex newtype. I've emailed Bas van Dijk in hope he can
help get the newtype back.

Otherwise appears to build & work.

1 files changed, 4 insertions, 12 deletions

diff --git a/Annex.hs b/Annex.hs
index 6d245a92d..d21f0a06c 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -22,7 +22,7 @@ module Annex (
 	fromRepo,
 ) where
 
-import Control.Monad.IO.Control
+import Control.Monad.Trans.Control
 import Control.Monad.State
 
 import Common
@@ -38,15 +38,7 @@ import Types.UUID
 import qualified Utility.Matcher
 
 -- git-annex's monad
-newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }
-	deriving (
-		Monad,
-		MonadIO,
-		MonadControlIO,
-		MonadState AnnexState,
-		Functor,
-		Applicative
-	)
+type Annex = StateT AnnexState IO
 
 data OutputType = NormalOutput | QuietOutput | JSONOutput
 
@@ -102,9 +94,9 @@ new gitrepo = newState <$> Git.configRead gitrepo
 
 {- performs an action in the Annex monad -}
 run :: AnnexState -> Annex a -> IO (a, AnnexState)
-run s a = runStateT (runAnnex a) s
+run s a = runStateT a s
 eval :: AnnexState -> Annex a -> IO a
-eval s a = evalStateT (runAnnex a) s
+eval s a = evalStateT a s
 
 {- Gets a value from the internal state, selected by the passed value
  - constructor. -}