Merge branch 'master' of https://github.com/haskell/haskell-ide-engine into 8.6.2-dist

Author: lukel97

Diff for: Makefile

@@ -99,8 +99,8 @@ submodules:
 ## NOTE 3: This is needed for stack only projects too
 cabal:
 	stack install cabal-install
-	cabal v1-update
-	cabal v1-install Cabal-2.4.1.0 --with-compiler=$(GHC)
+	cabal update
+	cabal install Cabal-2.4.1.0 --with-compiler=$(GHC)
 .PHONY: cabal
 
 # ------------------------------------------------------
@@ -111,8 +111,8 @@ build-docs:
 	&& stack --stack-yaml=stack-8.2.2.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.4.2.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.4.3.yaml exec hoogle generate \
-	&& stack --stack-yaml=stack-8.4.4.yaml exec hoogle generate
-	&& stack --stack-yaml=stack-8.6.1.yaml exec hoogle generate
+	&& stack --stack-yaml=stack-8.4.4.yaml exec hoogle generate \
+	&& stack --stack-yaml=stack-8.6.1.yaml exec hoogle generate \
 	&& stack --stack-yaml=stack-8.6.2.yaml exec hoogle generate
 .PHONY: build-docs
 
@@ -125,8 +125,8 @@ test: submodules cabal
 	&& stack --stack-yaml=stack-8.2.2.yaml test \
 	&& stack --stack-yaml=stack-8.4.2.yaml test \
 	&& stack --stack-yaml=stack-8.4.3.yaml test \
-	&& stack --stack-yaml=stack-8.4.4.yaml test
-	&& stack --stack-yaml=stack-8.6.1.yaml test
+	&& stack --stack-yaml=stack-8.4.4.yaml test \
+	&& stack --stack-yaml=stack-8.6.1.yaml test \
 	&& stack --stack-yaml=stack-8.6.2.yaml test
 .PHONY: test
 
@@ -135,8 +135,8 @@ build-copy-compiler-tool: submodules cabal
 	&& stack --stack-yaml=stack-8.2.2.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.4.2.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.4.3.yaml build --copy-compiler-tool \
-	&& stack --stack-yaml=stack-8.4.4.yaml build --copy-compiler-tool
-	&& stack --stack-yaml=stack-8.6.1.yaml build --copy-compiler-tool
+	&& stack --stack-yaml=stack-8.4.4.yaml build --copy-compiler-tool \
+	&& stack --stack-yaml=stack-8.6.1.yaml build --copy-compiler-tool \
 	&& stack --stack-yaml=stack-8.6.2.yaml build --copy-compiler-tool
 .PHONY: build-copy-compiler-tool
 

Diff for: README.md

@@ -157,46 +157,26 @@ to VS Code user settings.
 
 Otherwise, do one of the following.
 
-#### For GHC 8.4.3
+#### For GHC 8.4.4
 
 Using master
 
 ```bash
 stack install
 ```
-#### For GHC 8.4.2
 
-Using master
-
-```bash
-stack --stack-yaml=stack-8.4.2.yaml install
-```
-
-#### For GHC 8.2.2
+#### For Earlier Versions of GHC
 
 Using master
 
 ```bash
-stack --stack-yaml=stack-8.2.2.yaml install
-```
-
-Using branch `hie-0.1.0.0`
-
-```bash
-stack install
-```
-
-#### For GHC 8.2.1
-
-```bash
-stack --stack-yaml=stack-8.2.1.yaml install
+stack --stack-yaml=stack-<VERSION>.yaml install
 ```
 
-#### For GHC 8.0.2 (only via branch `hie-0.1.0.0`)
+where <VERSION> correlates to one of the yaml files in the hie directory.
 
-```bash
-stack --stack-yaml=stack-8.0.2.yaml install
-```
+Note that GHC 8.0.2 is only available via branch `hie-0.1.0.0` and will require
+you to use the instructions above 'For Earlier Versions of GHC'
 
 ### Installation on Windows