From 68f7abff47fc4d4e38c7f8f400157c07c995f3e7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 11 May 2014 15:56:18 +0300
Subject: [PATCH] Library updates

---
 Application.hs        | 1 -
 Data/Hackage.hs       | 6 +++---
 stackage-server.cabal | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Application.hs b/Application.hs
index 8d2850f..8b235bc 100644
--- a/Application.hs
+++ b/Application.hs
@@ -155,7 +155,6 @@ makeFoundation conf = do
 
 instance MonadActive m => MonadActive (SqlPersistT m) where -- FIXME orphan upstream
     monadActive = lift monadActive
-deriving instance MonadCatch m => MonadCatch (SqlPersistT m)
 instance MonadReader env m => MonadReader env (SqlPersistT m) where
     ask = lift ask
 
diff --git a/Data/Hackage.hs b/Data/Hackage.hs
index 07a8276..4ba7f32 100644
--- a/Data/Hackage.hs
+++ b/Data/Hackage.hs
@@ -23,7 +23,7 @@ import Text.XML.Cursor (($//), (&/), content, fromDocument, element, followingSi
 import Text.HTML.DOM (sinkDoc)
 import System.IO.Temp (withSystemTempFile, withSystemTempDirectory)
 import System.IO (IOMode (ReadMode), openBinaryFile)
-import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Catch (MonadMask)
 import Model (Uploaded (Uploaded))
 import Filesystem (createTree)
 import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult (ParseOk))
@@ -51,7 +51,7 @@ loadCabalFiles :: ( MonadActive m
                   , HasBlobStore env StoreKey
                   , HasHackageRoot env
                   , MonadLogger m
-                  , MonadCatch m
+                  , MonadMask m
                   )
                => UploadHistory -- ^ initial
                -> m UploadState
@@ -236,7 +236,7 @@ sourceHackageViewSdist viewName name version = do
         | otherwise = e
 
 createView :: ( MonadResource m
-              , MonadCatch m
+              , MonadMask m
               , MonadReader env m
               , HasBlobStore env StoreKey
               , MonadBaseControl IO m
diff --git a/stackage-server.cabal b/stackage-server.cabal
index eda1fcd..0e32bca 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -74,7 +74,7 @@ library
                  , yesod-form                    >= 1.3        && < 1.4
                  , bytestring                    >= 0.9        && < 0.11
                  , text                          >= 0.11       && < 2.0
-                 , persistent                    >= 1.3        && < 1.4
+                 , persistent                    >= 1.3.1      && < 1.4
                  , persistent-postgresql         >= 1.3        && < 1.4
                  , persistent-template           >= 1.3        && < 1.4
                  , template-haskell
@@ -104,7 +104,7 @@ library
                  , aws                           >= 0.9        && < 0.10
                  , conduit-extra
                  , tar                           >= 0.4        && < 0.5
-                 , temporary                     >= 1.2        && < 1.3
+                 , temporary-rc                  >= 1.2        && < 1.3
                  , cryptohash-conduit            >= 0.1.1      && < 0.2
                  , exceptions
                  , byteable