From e96718540396eea638d4aa0abbc71ada0f1715da Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 Aug 2014 15:52:26 +0300 Subject: [PATCH] Switch to a Stackage snapshot Pinging @chrisdone --- Application.hs | 1 + stackage-server.cabal | 69 ++++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/Application.hs b/Application.hs index 5b79c80..db3e6df 100644 --- a/Application.hs +++ b/Application.hs @@ -130,6 +130,7 @@ makeFoundation useEcho conf = do <$> pure (encodeUtf8 access) <*> pure (encodeUtf8 secret) <*> newIORef [] + <*> pure Nothing return $ cachedS3Store root creds bucket prefix manager let logger = Yesod.Core.Types.Logger loggerSet' getter diff --git a/stackage-server.cabal b/stackage-server.cabal index 4128204..2e8a029 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -1,3 +1,4 @@ +-- Stackage snapshot: http://www.stackage.org/stackage/aecbf72b568a63e86a971311fee5475f076043cc name: stackage-server version: 0.0.0 cabal-version: >= 1.8 @@ -70,46 +71,46 @@ library UndecidableInstances build-depends: - base >= 4 && < 5 - , yesod >= 1.2.5 && < 1.3 - , yesod-core >= 1.2.19 && < 1.3 - , yesod-auth >= 1.3 && < 1.4 - , yesod-static >= 1.2 && < 1.3 - , yesod-form >= 1.3.14 && < 1.4 - , bytestring >= 0.9 && < 0.11 - , text >= 0.11 && < 2.0 - , persistent >= 1.3.1 && < 1.4 - , persistent-postgresql >= 1.3 && < 1.4 - , persistent-template >= 1.3 && < 1.4 + base >= 4 + , yesod >= 1.2.5 + , yesod-core >= 1.2.19 + , yesod-auth >= 1.3 + , yesod-static >= 1.2 + , yesod-form >= 1.3.14 + , bytestring >= 0.9 + , text >= 0.11 + , persistent >= 1.3.1 + , persistent-postgresql >= 1.3 + , persistent-template >= 1.3 , template-haskell - , shakespeare >= 2.0 && < 2.1 - , hjsmin >= 0.1 && < 0.2 - , monad-control >= 0.3 && < 0.4 - , wai-extra >= 2.1 && < 2.2 - , yaml >= 0.8 && < 0.9 - , http-conduit >= 2.1.2.3 && < 2.2 - , directory >= 1.1 && < 1.3 - , warp >= 2.1 && < 2.2 + , shakespeare >= 2.0 + , hjsmin >= 0.1 + , monad-control >= 0.3 + , wai-extra >= 2.1 + , yaml >= 0.8 + , http-conduit >= 2.1.2.3 + , directory >= 1.1 + , warp >= 2.1 , data-default - , aeson >= 0.6 && < 0.8 - , conduit >= 1.0 && < 2.0 - , monad-logger >= 0.3.6 && < 0.4 - , fast-logger >= 2.1.4 && < 2.2 - , wai >= 2.1 && < 2.2 - , wai-logger >= 2.1 && < 2.2 - , classy-prelude-yesod >= 0.9.2 && < 0.9.3 - , mwc-random >= 0.13 && < 0.14 - , mtl >= 2.1 && < 2.2 - , blaze-markup >= 0.6 && < 0.7 + , aeson >= 0.6 + , conduit >= 1.0 + , monad-logger >= 0.3.6 + , fast-logger >= 2.1.4 + , wai >= 2.1 + , wai-logger >= 2.1 + , classy-prelude-yesod >= 0.9.2 + , mwc-random >= 0.13 + , mtl >= 2.1 + , blaze-markup >= 0.6 , ghc-prim , system-fileio , system-filepath , resourcet >= 1.1.2 - , aws >= 0.9 && < 0.10 + , aws , conduit-extra - , tar >= 0.4 && < 0.5 - , temporary-rc >= 1.2 && < 1.3 - , cryptohash-conduit >= 0.1.1 && < 0.2 + , tar >= 0.4 + , temporary-rc >= 1.2 + , cryptohash-conduit >= 0.1.1 , exceptions , byteable , cryptohash @@ -147,7 +148,7 @@ test-suite test build-depends: base , stackage-server - , yesod-test >= 1.2 && < 1.3 + , yesod-test >= 1.2 , yesod-core , yesod , persistent