diff --git a/Application.hs b/Application.hs index adb4601..e326685 100644 --- a/Application.hs +++ b/Application.hs @@ -151,13 +151,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 MonadCatch m => MonadCatch (ResourceT m) where - catch (ResourceT m) c = ResourceT $ \r -> m r `catch` \e -> unResourceT (c e) r - mask a = ResourceT $ \e -> mask $ \u -> unResourceT (a $ q u) e - where q u (ResourceT b) = ResourceT (u . b) - uninterruptibleMask a = - ResourceT $ \e -> uninterruptibleMask $ \u -> unResourceT (a $ q u) e - where q u (ResourceT b) = ResourceT (u . b) instance MonadReader env m => MonadReader env (SqlPersistT m) where ask = lift ask diff --git a/stackage-server.cabal b/stackage-server.cabal index 8c20a19..dd929fe 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -97,7 +97,7 @@ library , ghc-prim , system-fileio , system-filepath - , resourcet + , resourcet >= 1.1.2 , aws >= 0.9 && < 0.10 , conduit-extra , tar >= 0.4 && < 0.5