From 908a8156e291e1a802ffe9c4454ce372113b6f3d Mon Sep 17 00:00:00 2001
From: Jake Wheat <jakewheatmail@gmail.com>
Date: Fri, 5 Jul 2019 19:19:10 +0100
Subject: [PATCH] small updates for latest packages, cabal and ghc

---
 Makefile                | 14 +++++++-------
 simple-sql-parser.cabal |  8 ++++----
 website/make_website.sh |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index a38edbb..3309cde 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,14 @@
 
 .PHONY : init
 init :
-	cabal sandbox init
-	cabal install happy
-	cabal install --only-dependencies --enable-tests
-	cabal configure --enable-tests
+	cabal v1-sandbox init
+	cabal v1-install happy
+	cabal v1-install --only-dependencies --enable-tests
+	cabal v1-configure --enable-tests
 
 .PHONY : build
 build :
-	cabal build
+	cabal v1-build
 
 .PHONY : test
 test : build
@@ -25,7 +25,7 @@ website :
 
 .PHONY : clean
 clean :
-	cabal clean
-	cabal sandbox delete
+	cabal v1-clean
+	cabal v1-sandbox delete
 	rm -Rf build/
 
diff --git a/simple-sql-parser.cabal b/simple-sql-parser.cabal
index cbc5efa..aadf118 100644
--- a/simple-sql-parser.cabal
+++ b/simple-sql-parser.cabal
@@ -56,7 +56,7 @@ Test-Suite Tests
                        parsec >=3.1 && <3.2,
                        mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2,
-                       tasty >= 1.1 && < 1.2,
+                       tasty >= 1.1 && < 1.3,
                        tasty-hunit >= 0.9 && < 0.11
 
   Other-Modules:       Language.SQL.SimpleSQL.Pretty,
@@ -99,7 +99,7 @@ executable SimpleSqlParserTool
                        parsec >=3.1 && <3.2,
                        mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2,
-                       pretty-show >= 1.6 && < 1.9
+                       pretty-show >= 1.6 && < 1.10
   other-extensions:    TupleSections,DeriveDataTypeable
   default-language:    Haskell2010
   ghc-options:         -Wall
@@ -115,8 +115,8 @@ executable Fixity
                        parsec >=3.1 && <3.2,
                        mtl >=2.1 && <2.3,
                        pretty >= 1.1 && < 1.2,
-                       pretty-show >= 1.6 && < 1.9,
-                       tasty >= 1.1 && < 1.2,
+                       pretty-show >= 1.6 && < 1.10,
+                       tasty >= 1.1 && < 1.3,
                        tasty-hunit >= 0.9 && < 0.11
 
   other-extensions:    TupleSections,DeriveDataTypeable
diff --git a/website/make_website.sh b/website/make_website.sh
index 5760327..b960250 100755
--- a/website/make_website.sh
+++ b/website/make_website.sh
@@ -22,7 +22,7 @@ asciidoctor website/supported_sql.asciidoc -o - | runhaskell website/AddLinks.lh
 # tpch sql file
 # pandoc src/tpch.sql -s --highlight-style kate -o tpch.sql.html
 # rendered test cases
-runhaskell -package-db=.cabal-sandbox/x86_64-linux-ghc-7.10.3-packages.conf.d -i:tools website/RenderTestCases.lhs > build/test_cases.asciidoc
+runhaskell -package-db=.cabal-sandbox/x86_64-linux-ghc-8.6.5-packages.conf.d -i:tools website/RenderTestCases.lhs > build/test_cases.asciidoc
 
 #pandoc --from=markdown --to=html build/test_cases.asciidoc -o build/test_cases.html -c main.css '--title=simple-sql-parser examples/test cases' --toc
 asciidoctor build/test_cases.asciidoc -o - | \