From 8ffb235fda1147ce640d1b08d76fe685ebec6216 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 13 May 2015 20:26:33 +0300
Subject: [PATCH 1/3] Require newer stackage-types with bugfix

---
 Handler/UploadV2.hs   | 6 +++---
 stackage-server.cabal | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Handler/UploadV2.hs b/Handler/UploadV2.hs
index b8cd813..8ee0af8 100644
--- a/Handler/UploadV2.hs
+++ b/Handler/UploadV2.hs
@@ -123,7 +123,7 @@ doUpload status uid ident bundleFP = do
             _ -> Nothing
     slug' <-
         case siType of
-            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2"]
+            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2 (1)"]
             STNightly2 day -> return $ "nightly-" ++ tshow day
             STLTS major minor -> return $ concat
                 [ "lts-"
@@ -133,7 +133,7 @@ doUpload status uid ident bundleFP = do
                 ]
     title <-
         case siType of
-            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2"]
+            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2 (2)"]
             STNightly2 day -> return $ concat
                 [ "Stackage Nightly "
                 , tshow day
@@ -238,7 +238,7 @@ finishUpload
             , stackageGhcMajorVersion = ghcMajorVersionMay
             }
         case siType of
-            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2"]
+            STNightly -> invalidArgs ["No longer support STNightly, use STNightly2 (3)"]
             STNightly2 day -> insert_ Nightly
                 { nightlyDay = day
                 , nightlyGhcVersion = ghcVersion
diff --git a/stackage-server.cabal b/stackage-server.cabal
index 06d83ce..2fb5507 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -168,7 +168,7 @@ library
                  , deepseq
                  , deepseq-generics
                  , auto-update
-                 , stackage-types >= 1.0.1
+                 , stackage-types >= 1.0.1.1
                  , stackage-build-plan >= 0.1.1
                  , yesod-sitemap
                  , streaming-commons

From 607d6faab25a62e56b38cd89e7c1e4970fb44699 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 13 May 2015 20:33:42 +0300
Subject: [PATCH 2/3] GHC 7.10 and system-filepath issues

---
 Echo.hs               | 2 ++
 stackage-server.cabal | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Echo.hs b/Echo.hs
index eff2102..397fb99 100644
--- a/Echo.hs
+++ b/Echo.hs
@@ -11,7 +11,9 @@ module Echo where
 
 import Control.Concurrent.MVar
 import Control.Monad.Trans      (MonadIO(..))
+#if !MIN_VERSION_time(1,5,0)
 import System.Locale
+#endif
 import Data.Time
 import Language.Haskell.TH
 import Language.Haskell.TH.Lift
diff --git a/stackage-server.cabal b/stackage-server.cabal
index 2fb5507..169f025 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -102,7 +102,7 @@ library
                   , blaze-markup                  >= 0.6
                   , byteable
                   , bytestring                    >= 0.9
-                  , classy-prelude-yesod          >= 0.9.2
+                  , classy-prelude-yesod          >= 0.9.2 && < 0.12
                   , conduit                       >= 1.0
                   , conduit-extra
                   , cryptohash
@@ -137,7 +137,7 @@ library
                   , wai-extra                     >= 2.1
                   , wai-logger                    >= 2.1
                   , warp                          >= 2.1
-                  , xml-conduit
+                  , xml-conduit < 1.3
                   , yaml                          >= 0.8
                   , yesod                         >= 1.2.5
                   , yesod-auth                    >= 1.3

From 88b98b9a3c251e0f858139f3e2c0b36840a95b1b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 13 May 2015 20:58:27 +0300
Subject: [PATCH 3/3] A few more upper bounds

---
 stackage-server.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stackage-server.cabal b/stackage-server.cabal
index 169f025..4d308de 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -143,7 +143,7 @@ library
                   , yesod-auth                    >= 1.3
                   , yesod-core                    >= 1.2.19
                   , yesod-form                    >= 1.3.14
-                  , yesod-static                  >= 1.2
+                  , yesod-static                  >= 1.2 && < 1.5
                   , zlib
                   , unordered-containers
                   , hashable
@@ -162,7 +162,7 @@ library
                  , blaze-html
                  , haddock-library
                  , async
-                 , yesod-gitrepo >= 0.1.1
+                 , yesod-gitrepo >= 0.1.1 && < 0.2
                  , hoogle
                  , spoon
                  , deepseq