From 01118c957967f3f771899ad495221f2fc844b2c0 Mon Sep 17 00:00:00 2001
From: Joe Nelson <cred+github@begriffs.com>
Date: Fri, 3 Oct 2014 21:44:30 -0700
Subject: [PATCH 1/2] Use cached cabal sandbox and add a linting step

---
 .travis.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68b456283..538057378 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,12 @@ before_install:
   - travis_retry sudo apt-get update
   - travis_retry sudo apt-get install --force-yes happy-1.19.3 alex-3.1.3
   - export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.3/bin:$PATH
-before_script:
-  - cabal configure --enable-tests
-  - cabal build
+install:
+  - curl http://bin.begriffs.com/dbapi/cabal-sandbox.tar.xz | tar xJ
+  - chmod a+x .cabal-sandbox/bin/*
+  - cabal sandbox init
+  - cabal install --enable-test --dependencies-only
+  - cabal install --enable-test
 script:
   - cabal test --show-details=always --test-options="--color"
+  - .cabal-sandbox/bin/hlint src/*.hs test/**/*.hs

From d66ffe8f3156516f6fe5244a50aa9b643954ad63 Mon Sep 17 00:00:00 2001
From: Joe Nelson <cred+github@begriffs.com>
Date: Fri, 3 Oct 2014 22:49:31 -0700
Subject: [PATCH 2/2] Fix linter complaint

---
 test/Unit/PgQuerySpec.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Unit/PgQuerySpec.hs b/test/Unit/PgQuerySpec.hs
index 87ad0a96e..82c20bc92 100644
--- a/test/Unit/PgQuerySpec.hs
+++ b/test/Unit/PgQuerySpec.hs
@@ -63,7 +63,7 @@ spec = around dbWithSchema $ do
       cs newRole `shouldBe` role
       checkPass (cs encryptedPass) pass `shouldBe` True
 
-    it "will not add a user with an unknown role" $ \conn -> do
+    it "will not add a user with an unknown role" $ \conn ->
       addUser user pass "not-a-real-role" conn `shouldThrow` \e ->
         take 2 (seState e) == "23" --integrity constraint violation