Bring in GHC 8.6.2 stack files and makefile targets

Author: alanz

Makefile

@@ -5,7 +5,9 @@ all: help
 .PHONY: all
 
 ## Builds hie for all supported GHC versions (8.2.1, 8.2.2, 8.4.2 and 8.4.3, 8.4.4)
-build: hie-8.2.1 hie-8.2.2 hie-8.4.2 hie-8.4.3 hie-8.4.4
+build: hie-8.2.1 hie-8.2.2 \
+       hie-8.4.2 hie-8.4.3 hie-8.4.4 \
+       hie-8.6.1 hie-8.6.2
 .PHONY: build
 
 ## Builds hie and hoogle databases for all supported GHC versions
@@ -56,6 +58,22 @@ hie-8.4.4: submodules
 		&& cp '$(STACKLOCALBINDIR)/hie-8.4.4' '$(STACKLOCALBINDIR)/hie-8.4'
 .PHONY: hie-8.4.4
 
+## Builds hie for GHC version 8.6.1 only
+hie-8.6.1: submodules
+	stack --stack-yaml=stack-8.6.1.yaml build
+	stack --stack-yaml=stack-8.6.1.yaml install                                      \
+		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.6.1'    \
+		&& cp '$(STACKLOCALBINDIR)/hie-8.6.1' '$(STACKLOCALBINDIR)/hie-8.4'
+.PHONY: hie-8.6.1
+
+## Builds hie for GHC version 8.6.2 only
+hie-8.6.2: submodules
+	stack --stack-yaml=stack-8.6.2.yaml build
+	stack --stack-yaml=stack-8.6.2.yaml install                                      \
+		&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.6.2'    \
+		&& cp '$(STACKLOCALBINDIR)/hie-8.6.2' '$(STACKLOCALBINDIR)/hie-8.4'
+.PHONY: hie-8.6.2
+
 # ------------------------------------------------------
 
 ## Updates local git submodules
@@ -70,6 +88,8 @@ build-docs:
 	&& 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.6.2.yaml exec hoogle generate
 .PHONY: build-docs
 
 
@@ -82,6 +102,8 @@ test: submodules
 	&& 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.6.2.yaml test
 .PHONY: test
 
 build-copy-compiler-tool: submodules
@@ -90,6 +112,8 @@ build-copy-compiler-tool: submodules
 	&& 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.6.2.yaml build --copy-compiler-tool
 .PHONY: build-copy-compiler-tool
 
 ## Fixes icu related problems in MacOS
@@ -114,6 +138,12 @@ icu-macos-fix-build:
 	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
 	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
 	&& stack --stack-yaml=stack-8.4.4.yaml build text-icu  \
+	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
+	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
+	&& stack --stack-yaml=stack-8.6.1.yaml build text-icu  \
+	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
+	  --extra-include-dirs=/usr/local/opt/icu4c/include    \
+	&& stack --stack-yaml=stack-8.6.2.yaml build text-icu  \
 	  --extra-lib-dirs=/usr/local/opt/icu4c/lib            \
 	  --extra-include-dirs=/usr/local/opt/icu4c/include
 .PHONY: icu-macos-fix-build

stack-8.2.1.yaml

@@ -22,7 +22,7 @@ extra-deps:
 - haskell-lsp-types-0.8.0.1
 - hlint-2.0.11
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - pretty-show-1.8.2
 - sorted-list-0.2.1.0
 - syz-0.2.0.0

stack-8.2.2.yaml

@@ -22,7 +22,7 @@ extra-deps:
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - pretty-show-1.8.2
 - sorted-list-0.2.1.0
 - syz-0.2.0.0

stack-8.4.2.yaml

@@ -21,7 +21,7 @@ extra-deps:
 - haskell-lsp-types-0.8.0.1
 - hlint-2.1.8
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - pretty-show-1.8.2
 - syz-0.2.0.0
 - temporary-1.2.1.1

stack-8.4.3.yaml

@@ -19,7 +19,7 @@ extra-deps:
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - pretty-show-1.8.2
 - syz-0.2.0.0
 - temporary-1.2.1.1

stack-8.4.4.yaml

@@ -19,7 +19,7 @@ extra-deps:
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - pretty-show-1.8.2
 - syz-0.2.0.0
 - temporary-1.2.1.1

stack-8.6.1.yaml

@@ -27,7 +27,7 @@ extra-deps:
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
-- lsp-test-0.5.0.0
+- lsp-test-0.5.0.1
 - monad-memo-0.4.1
 - monoid-subclasses-0.4.6.1
 - multistate-0.8.0.1

stack-8.6.2.yaml

@@ -0,0 +1,63 @@
+resolver: nightly-2018-11-13 # GHC 8.6.2
+packages:
+- .
+- hie-plugin-api
+
+extra-deps:
+- ./submodules/HaRe
+- ./submodules/brittany
+- ./submodules/cabal-helper
+- ./submodules/ghc-mod
+- ./submodules/ghc-mod/core
+
+- apply-refact-0.6.0.0
+- butcher-1.3.2.1
+- cabal-install-2.4.0.0
+- cabal-plan-0.4.0.0
+- constrained-dynamic-0.1.0.0
+- cryptohash-sha256-0.11.101.0
+- czipwith-1.0.1.1
+- data-tree-print-0.1.0.2
+- ed25519-0.0.5.0
+- ekg-core-0.1.1.4
+- ekg-json-0.1.0.6
+- ekg-wai-0.1.0.3
+- hackage-security-0.5.3.0
+- haddock-api-2.21.0
+- haskell-lsp-0.8.0.1
+- haskell-lsp-types-0.8.0.1
+- hsimport-0.8.6
+- lsp-test-0.5.0.1
+- monad-memo-0.4.1
+- monoid-subclasses-0.4.6.1
+- multistate-0.8.0.1
+- primes-0.2.1.0
+- resolv-0.1.1.2
+- syz-0.2.0.0
+- temporary-1.2.1.1
+- yaml-0.8.32
+
+
+
+flags:
+  haskell-ide-engine:
+    pedantic: true
+  hie-plugin-api:
+    pedantic: true
+  # ekg-core:
+  #   allow-newer: true
+  # ekg-json:
+  #   allow-newer: true
+  # ekg-wai:
+  #   allow-newer: true
+  # base:
+  #   allow-newer: true
+  # process:
+  #   allow-newer: true
+
+allow-newer: true
+
+nix:
+  packages: [ icu libcxx zlib ]
+
+concurrent-tests: false

stack.yaml

@@ -21,7 +21,7 @@ extra-deps:
 - haskell-lsp-0.8.0.1
 - haskell-lsp-types-0.8.0.1
 - hsimport-0.8.6
-- lsp-test-0.4.0.0
+- lsp-test-0.5.0.1
 - monad-memo-0.4.1
 - pretty-show-1.8.2
 - semigroupoids-5.2.2