Merge branch 'master' into 1246

paf31 · paf31 · commit f144aabd98db · 2015-08-11T19:21:18.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ env:
   - GHCVER=7.10.1
   - GHCVER=7.8.4 STACKAGE=lts-2.22
   # 7.10.2 Pending https://github.com/travis-ci/apt-package-whitelist/pull/686
-  - GHCVER=7.10.1 STACKAGE-nightly-2015-08-09
+  - GHCVER=7.10.1 STACKAGE=nightly-2015-08-09
 before_install:
   - export PATH="/opt/ghc/$GHCVER/bin:$PATH"
   - export PATH="/opt/cabal/1.22/bin:$PATH"
@@ -17,7 +17,8 @@ install:
   - cabal --version
   - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - travis_retry cabal update
-  - cabal sandbox init
+  - mkdir -p sandboxes/$GHCVER/${STACKAGE:-none}
+  - cabal sandbox init --sandbox sandboxes/$GHCVER/${STACKAGE:-none}
   # Download stackage cabal.config
   # Not sure whether filtering out purescript is necessary
   - if [ -n "$STACKAGE" ]; then curl http://www.stackage.org/$STACKAGE/cabal.config | grep -v purescript > cabal.config; fi
@@ -64,5 +65,5 @@ addons:
       - alex-3.1.4
 cache:
   directories:
-    - .cabal-sandbox
-    - ../install-test/.cabal-sandbox
+    - sandboxes/
+    - ../install-test/sandboxes/
diff --git a/README.md b/README.md
@@ -15,8 +15,7 @@ A small strongly typed programming language with expressive types that compiles
 - [PureScript book](https://leanpub.com/purescript/read)
 - [Wiki](http://wiki.purescript.org)
 - [Try PureScript](http://try.purescript.org)
-- [Pursuit package search engine](http://pursuit.purescript.org/)
-- [Core library documentation index](http://functorial.com/psc-pages/docs)
+- [Pursuit Package Index](http://pursuit.purescript.org/)
 
 ## Help!
 
diff --git a/travis/test-install.sh b/travis/test-install.sh
@@ -7,6 +7,7 @@ if SRC_TGZ="$PWD/dist/$(cabal info . | awk '{print $2;exit}').tar.gz"
 then
   mkdir -p ../install-test
   cd ../install-test
-  cabal sandbox init
+  mkdir -p sandboxes/$GHCVER/${STACKAGE:-none}
+  cabal sandbox init --sandbox sandboxes/$GHCVER/${STACKAGE:-none}
   cabal install -j2 --ghc-options='+RTS -A32m -RTS' "$SRC_TGZ"
 fi
