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

Library updates

Browse Source
This commit is contained in:
Michael Snoyman 2014-05-11 15:56:18 +03:00
parent 2faf95e680
commit 68f7abff47
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Application.hs
View File

@ -155,7 +155,6 @@ makeFoundation conf = do
instance MonadActive m => MonadActive (SqlPersistT m) where -- FIXME orphan upstream instance MonadActive m => MonadActive (SqlPersistT m) where -- FIXME orphan upstream
monadActive = lift monadActive monadActive = lift monadActive
deriving instance MonadCatch m => MonadCatch (SqlPersistT m)
instance MonadReader env m => MonadReader env (SqlPersistT m) where instance MonadReader env m => MonadReader env (SqlPersistT m) where
ask = lift ask ask = lift ask

6
Data/Hackage.hs
View File

@ -23,7 +23,7 @@ import Text.XML.Cursor (($//), (&/), content, fromDocument, element, followingSi
import Text.HTML.DOM (sinkDoc) import Text.HTML.DOM (sinkDoc)
import System.IO.Temp (withSystemTempFile, withSystemTempDirectory) import System.IO.Temp (withSystemTempFile, withSystemTempDirectory)
import System.IO (IOMode (ReadMode), openBinaryFile) import System.IO (IOMode (ReadMode), openBinaryFile)
import Control.Monad.Catch (MonadCatch) import Control.Monad.Catch (MonadMask)
import Model (Uploaded (Uploaded)) import Model (Uploaded (Uploaded))
import Filesystem (createTree) import Filesystem (createTree)
import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult (ParseOk)) import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult (ParseOk))
@ -51,7 +51,7 @@ loadCabalFiles :: ( MonadActive m
, HasBlobStore env StoreKey , HasBlobStore env StoreKey
, HasHackageRoot env , HasHackageRoot env
, MonadLogger m , MonadLogger m
, MonadCatch m , MonadMask m
) )
=> UploadHistory -- ^ initial => UploadHistory -- ^ initial
-> m UploadState -> m UploadState
@ -236,7 +236,7 @@ sourceHackageViewSdist viewName name version = do
| otherwise = e | otherwise = e
createView :: ( MonadResource m createView :: ( MonadResource m
, MonadCatch m , MonadMask m
, MonadReader env m , MonadReader env m
, HasBlobStore env StoreKey , HasBlobStore env StoreKey
, MonadBaseControl IO m , MonadBaseControl IO m

4
stackage-server.cabal
View File

@ -74,7 +74,7 @@ library
, yesod-form >= 1.3 && < 1.4 , yesod-form >= 1.3 && < 1.4
, bytestring >= 0.9 && < 0.11 , bytestring >= 0.9 && < 0.11
, text >= 0.11 && < 2.0 , text >= 0.11 && < 2.0
, persistent >= 1.3 && < 1.4 , persistent >= 1.3.1 && < 1.4
, persistent-postgresql >= 1.3 && < 1.4 , persistent-postgresql >= 1.3 && < 1.4
, persistent-template >= 1.3 && < 1.4 , persistent-template >= 1.3 && < 1.4
, template-haskell , template-haskell
@ -104,7 +104,7 @@ library
, aws >= 0.9 && < 0.10 , aws >= 0.9 && < 0.10
, conduit-extra , conduit-extra
, tar >= 0.4 && < 0.5 , tar >= 0.4 && < 0.5
, temporary >= 1.2 && < 1.3 , temporary-rc >= 1.2 && < 1.3
, cryptohash-conduit >= 0.1.1 && < 0.2 , cryptohash-conduit >= 0.1.1 && < 0.2
, exceptions , exceptions
, byteable , byteable