postgres-haskell
diff --git a/‎.travis.yml
Lines changed: 2 additions & 4 deletions b/‎.travis.yml
Lines changed: 2 additions & 4 deletions
diff --git a/‎stack-ghc7.10.3.yaml
Lines changed: 0 additions & 15 deletions b/‎stack-ghc7.10.3.yaml
Lines changed: 0 additions & 15 deletions
diff --git a/‎stack-ghc8.0.2.yaml
Lines changed: 0 additions & 22 deletions b/‎stack-ghc8.0.2.yaml
Lines changed: 0 additions & 22 deletions
diff --git a/‎tests/Driver.hs
Lines changed: 1 addition & 1 deletion b/‎tests/Driver.hs
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests_connection/test.hs
Lines changed: 1 addition & 1 deletion b/‎tests_connection/test.hs
Lines changed: 1 addition & 1 deletion
@@ -1,5 +1,5 @@
 # Use new container infrastructure to enable caching
-dist: trusty
+dist: xenial
 sudo: false
 
 # Do not choose a language; we provide our own build tools.
@@ -8,8 +8,6 @@ language: generic
 os:
   - linux
 env:
-  - STACK_YAML=stack-ghc7.10.3.yaml
-  - STACK_YAML=stack-ghc8.0.2.yaml
   - STACK_YAML=stack-ghc8.2.2.yaml
   - STACK_YAML=stack-ghc8.4.4.yaml
   - STACK_YAML=stack-ghc8.6.3.yaml
@@ -27,7 +25,7 @@ addons:
   apt:
     packages:
       - libgmp-dev
-  postgresql: "9.6"
+  postgresql: "10"
 
 before_install:
   # Download and unpack the stack executable
 
@@ -5,7 +5,7 @@ import Data.Foldable
 import Control.Monad
 import Data.Maybe
 import Data.Int
-import Data.Either
+import Data.Either hiding (fromRight)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Char8 as BS
 
@@ -39,7 +39,7 @@ testConnection name confContent = testCase name $ withPghba confContent $
         }
 
 pghbaFilename :: FilePath
-pghbaFilename = "/etc/postgresql/9.5/main/pg_hba.conf"
+pghbaFilename = "/etc/postgresql/10/main/pg_hba.conf"
 
 withPghba :: B.ByteString -> IO a -> IO a
 withPghba confContent action = do
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ testConnection name confContent = testCase name $ withPghba confContent $`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`pghbaFilename :: FilePath`
`42`		`-pghbaFilename = "/etc/postgresql/9.5/main/pg_hba.conf"`
	`42`	`+pghbaFilename = "/etc/postgresql/10/main/pg_hba.conf"`
`43`	`43`
`44`	`44`	`withPghba :: B.ByteString -> IO a -> IO a`
`45`	`45`	`withPghba confContent action = do`