Merge branch 'ghc-7.10' of https://github.com/zudov/stackage-server into zudov-ghc-7.10

Conflicts:
	stack.yaml
This commit is contained in:
Michael Snoyman 2015-10-06 07:30:13 +03:00
commit 1d0cad2e0a

View File

@ -86,93 +86,92 @@ library
LambdaCase LambdaCase
build-depends: build-depends:
base >= 4 base >= 4.8 && < 4.9
, aeson >= 0.6 , aeson >= 0.8 && < 0.9
, aws , aws >= 0.12 && < 0.13
, base16-bytestring , base16-bytestring >= 0.1 && < 0.2
, blaze-markup >= 0.6 , blaze-markup >= 0.7 && < 0.8
, byteable , byteable >= 0.1 && < 0.2
, bytestring >= 0.9 , bytestring >= 0.10 && < 0.11
, classy-prelude-yesod >= 0.9.2 , classy-prelude-yesod >= 0.12 && < 0.13
, conduit >= 1.0 , conduit >= 1.2 && < 1.3
, conduit-extra , conduit-extra >= 1.1 && < 1.2
, cryptohash , cryptohash >= 0.11 && < 0.12
, cryptohash-conduit >= 0.1.1 , cryptohash-conduit >= 0.1.1 && < 0.2
, data-default , data-default >= 0.5 && < 0.6
, directory >= 1.1 , directory >= 1.2 && < 1.3
, email-validate , email-validate >= 2.1 && < 2.2
, esqueleto , esqueleto >= 2.4 && < 2.5
, exceptions , exceptions >= 0.8 && < 0.9
, fast-logger >= 2.1.4 , fast-logger >= 2.4 && < 2.5
, foreign-store , foreign-store >= 0.2 && < 0.3
, ghc-prim , ghc-prim >= 0.4 && < 0.5
, hjsmin >= 0.1 , hjsmin >= 0.1 && < 0.2
, html-conduit , html-conduit >= 1.2 && < 1.3
, http-conduit >= 2.1.2.3 , http-conduit >= 2.1.8 && < 2.2
, monad-control >= 0.3 , monad-control >= 1.0 && < 1.1
, monad-logger >= 0.3.6 , monad-logger >= 0.3.13 && < 0.4
, mtl >= 2.1 , mtl >= 2.2 && < 2.3
, mwc-random >= 0.13 , mwc-random >= 0.13 && < 0.14
, persistent >= 1.3.1 , persistent >= 2.2 && < 2.3
, persistent-template >= 1.3 , persistent-template >= 2.1 && < 2.2
, resourcet >= 1.1.2 , resourcet >= 1.1.6 && < 1.2
, shakespeare >= 2.0 , shakespeare >= 2.0 && < 2.1
, system-fileio , system-fileio >= 0.3 && < 0.4
, system-filepath , system-filepath >= 0.4 && < 0.5
, tar >= 0.4 , tar >= 0.4 && < 0.5
, template-haskell , template-haskell >= 2.10 && < 2.11
, temporary-rc >= 1.2 , temporary-rc >= 1.2 && < 1.3
, text >= 0.11 , text >= 1.2 && < 1.3
, wai >= 2.1 , wai >= 3.0 && < 3.1
, wai-extra >= 2.1 , wai-extra >= 3.0 && < 3.1
, wai-logger >= 2.1 , wai-logger >= 2.2 && < 2.3
, warp >= 2.1 , warp >= 3.1 && < 3.2
, xml-conduit , xml-conduit >= 1.3 && < 1.4
, yaml >= 0.8 , yaml >= 0.8 && < 0.9
, yesod >= 1.2.5 , yesod >= 1.4 && < 1.5
, yesod-auth >= 1.3 , yesod-auth >= 1.4 && < 1.5
, yesod-core >= 1.2.19 , yesod-core >= 1.4 && < 1.5
, yesod-form >= 1.3.14 , yesod-form >= 1.4 && < 1.5
, yesod-static >= 1.2 , yesod-static >= 1.5 && < 1.6
, zlib , zlib >= 0.5 && < 0.6
, unordered-containers , unordered-containers >= 0.2 && < 0.3
, hashable , hashable >= 1.2 && < 1.3
-- Avoid https://github.com/haskell/cabal/issues/1202 , Cabal >= 1.22 && < 1.23
, Cabal >= 1.18 , lifted-base >= 0.2 && < 0.3
, lifted-base , mono-traversable >= 0.9 && < 0.10
, mono-traversable , time >= 1.5 && < 1.6
, time , process >= 1.2 && < 1.3
, process , old-locale >= 1.0 && < 1.1
, old-locale , th-lift >= 0.7 && < 0.8
, th-lift , mime-types >= 0.1 && < 0.2
, mime-types , unix >= 2.7 && < 2.8
, unix , markdown >= 0.1.13 && < 0.2
, markdown >= 0.1.13 , formatting >= 6.2 && < 6.3
, formatting , blaze-html >= 0.8 && < 0.9
, blaze-html , haddock-library >= 1.2.0 && < 1.3
, haddock-library >= 1.2.0 , async >= 2.0 && < 2.1
, async , yesod-gitrepo >= 0.2 && < 0.3
, yesod-gitrepo >= 0.1.1 , hoogle >= 4.2 && < 4.3
, hoogle , spoon >= 0.3 && < 0.4
, spoon , deepseq >= 1.4 && < 1.5
, deepseq , deepseq-generics >= 0.1 && < 0.2
, deepseq-generics , auto-update >= 0.1 && < 0.2
, auto-update , stackage-types >= 1.1 && < 1.2
, stackage-types >= 1.0.1.1 , stackage-build-plan >= 0.1.1 && < 0.2
, stackage-build-plan >= 0.1.1 , yesod-sitemap >= 1.4 && < 1.5
, yesod-sitemap , streaming-commons >= 0.1 && < 0.2
, streaming-commons , classy-prelude-conduit >= 0.12 && < 0.13
, classy-prelude-conduit , path-pieces >= 0.2 && < 0.3
, path-pieces , persistent-sqlite >= 2.2 && < 2.3
, persistent-sqlite , stackage-metadata >= 0.3 && < 0.4
, stackage-metadata >= 0.2 , filepath >= 1.4 && < 1.5
, filepath , http-client >= 0.4 && < 0.5
, http-client , http-types >= 0.8 && < 0.9
, http-types , amazonka >= 0.3 && < 0.4
, amazonka , amazonka-core >= 0.3 && < 0.4
, amazonka-core , amazonka-s3 >= 0.3 && < 0.4
, amazonka-s3 , lens >= 4.12 && < 4.13
, lens
executable stackage-server executable stackage-server
if flag(library-only) if flag(library-only)