From d50a6181f551af8d3187063526ee5590fc6a085d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 8 Jan 2015 18:26:41 +0200 Subject: [PATCH] Require yesod-gitrepo 0.1.1 --- Application.hs | 18 ------------------ stackage-server.cabal | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Application.hs b/Application.hs index 38c3320..222d9e1 100644 --- a/Application.hs +++ b/Application.hs @@ -170,7 +170,6 @@ makeFoundation useEcho conf = do let haddockRootDir' = "/tmp/stackage-server-haddocks2" widgetCache' <- newIORef mempty -#if MIN_VERSION_yesod_gitrepo(0,1,1) websiteContent' <- if development then do void $ rawSystem "git" @@ -182,23 +181,6 @@ makeFoundation useEcho conf = do "https://github.com/fpco/stackage-content.git" "master" loadWebsiteContent -#else - websiteContent' <- if development - then do - void $ rawSystem "git" - [ "clone" - , "https://github.com/fpco/stackage-content.git" - ] - tmp <- gitRepo "stackage-content" "master" loadWebsiteContent - return tmp - { grRefresh = return () - , grContent = loadWebsiteContent "stackage-content" - } - else gitRepo - "https://github.com/fpco/stackage-content.git" - "master" - loadWebsiteContent -#endif env <- getEnvironment diff --git a/stackage-server.cabal b/stackage-server.cabal index ec40dea..22b405e 100644 --- a/stackage-server.cabal +++ b/stackage-server.cabal @@ -154,7 +154,7 @@ library , formatting , blaze-html , haddock-library - , yesod-gitrepo + , yesod-gitrepo >= 0.1.1 , hoogle , spoon , deepseq