From e9aec442e918f4b1dae373ee6d4377029b42f347 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 22 Mar 2015 16:16:28 +0200
Subject: [PATCH] stackage-types, simpler travis

---
 .travis.yml           | 10 +---------
 Foundation.hs         |  3 +--
 Handler/UploadV2.hs   |  5 +----
 stackage-server.cabal |  2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eef1a76..9fbe377 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,18 +24,10 @@ install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - travis_retry cabal update
  - cabal install alex happy
- - cabal install --only-dependencies --enable-tests --enable-benchmarks -j1
+ - cabal install --only-dependencies
 
 # Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
 script:
- - if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal configure --enable-tests --enable-benchmarks -v2  # -v2 provides useful information for debugging
- - cabal build   # this builds all libraries and executables (including tests/benchmarks)
-
- - cabal test
- - cabal check
- - cabal sdist   # tests that a source-distribution can be generated
-
  - yesod keter
  - mkdir -p to-travis
  - cp stackage-server.keter to-travis
diff --git a/Foundation.hs b/Foundation.hs
index 7bbb536..279f9c7 100644
--- a/Foundation.hs
+++ b/Foundation.hs
@@ -23,8 +23,7 @@ import           Yesod.Core.Types (Logger, GWData)
 import           Yesod.Default.Config
 import           Yesod.Default.Util (addStaticContentExternal)
 import           Yesod.GitRepo
-import Stackage.ServerBundle (SnapshotType, DocMap)
-import Stackage.BuildPlan (BuildPlan)
+import Stackage.Types
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
diff --git a/Handler/UploadV2.hs b/Handler/UploadV2.hs
index e8c104e..9ab9064 100644
--- a/Handler/UploadV2.hs
+++ b/Handler/UploadV2.hs
@@ -16,10 +16,7 @@ import qualified Data.ByteString.Base16 as B16
 import System.Timeout.Lifted (timeout)
 import Control.Concurrent.Async (async, cancel, waitCatchSTM)
 import Yesod.Core.Types (HandlerT (..))
-import Stackage.ServerBundle
-import Stackage.BuildPlan
-import Stackage.BuildConstraints
-import Stackage.Prelude (display)
+import Stackage.Types
 import Filesystem (createTree)
 import Filesystem.Path (parent)
 import Data.Conduit.Process
diff --git a/stackage-server.cabal b/stackage-server.cabal
index 7035fae..5a1b6f3 100644
--- a/stackage-server.cabal
+++ b/stackage-server.cabal
@@ -156,13 +156,13 @@ library
                  , blaze-html
                  , haddock-library
                  , async
-                 , stackage >= 0.4
                  , yesod-gitrepo >= 0.1.1
                  , hoogle
                  , spoon
                  , deepseq
                  , deepseq-generics
                  , auto-update
+                 , stackage-types
 
 executable         stackage-server
     if flag(library-only)