haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-01-12 12:18:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove an orphan instance

Browse Source
This commit is contained in:
Michael Snoyman 2014-04-16 10:42:31 +03:00
parent 37b35623b7
commit 6b105e9095
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Application.hs
View File

@ -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

2
stackage-server.cabal
View File

@ -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