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

Merge branch 'master' into simpler

Browse Source 
Conflicts:
	Handler/UploadV2.hs
This commit is contained in:
Michael Snoyman 2015-05-15 06:49:27 +03:00
commit 5dc16a55d5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Echo.hs
View File

@ -11,7 +11,9 @@ module Echo where
import Control.Concurrent.MVar import Control.Concurrent.MVar
import Control.Monad.Trans (MonadIO(..)) import Control.Monad.Trans (MonadIO(..))
#if !MIN_VERSION_time(1,5,0)
import System.Locale import System.Locale
#endif
import Data.Time import Data.Time
import Language.Haskell.TH import Language.Haskell.TH
import Language.Haskell.TH.Lift import Language.Haskell.TH.Lift

8
stackage-server.cabal
View File

@ -98,7 +98,7 @@ library
, blaze-markup >= 0.6 , blaze-markup >= 0.6
, byteable , byteable
, bytestring >= 0.9 , bytestring >= 0.9
, classy-prelude-yesod >= 0.9.2 , classy-prelude-yesod >= 0.9.2 && < 0.12
, conduit >= 1.0 , conduit >= 1.0
, conduit-extra , conduit-extra
, cryptohash , cryptohash
@ -133,13 +133,13 @@ library
, wai-extra >= 2.1 , wai-extra >= 2.1
, wai-logger >= 2.1 , wai-logger >= 2.1
, warp >= 2.1 , warp >= 2.1
, xml-conduit , xml-conduit < 1.3
, yaml >= 0.8 , yaml >= 0.8
, yesod >= 1.2.5 , yesod >= 1.2.5
, yesod-auth >= 1.3 , yesod-auth >= 1.3
, yesod-core >= 1.2.19 , yesod-core >= 1.2.19
, yesod-form >= 1.3.14 , yesod-form >= 1.3.14
, yesod-static >= 1.2 , yesod-static >= 1.2 && < 1.5
, zlib , zlib
, unordered-containers , unordered-containers
, hashable , hashable
@ -164,7 +164,7 @@ library
, deepseq , deepseq
, deepseq-generics , deepseq-generics
, auto-update , auto-update
, stackage-types >= 1.0.1 , stackage-types >= 1.0.1.1
, stackage-build-plan >= 0.1.1 , stackage-build-plan >= 0.1.1
, yesod-sitemap , yesod-sitemap
, streaming-commons , streaming-commons