;dev: update hie.yaml so HLS uses GHC 9.4, drop symlink

2023-03-14 10:37:19 -10:00 · 2023-03-14 10:37:19 -10:00 · c835d8f917
commit c835d8f917
parent d0e51597f7
2 changed files with 50 additions and 48 deletions
--- a/hie-stack9.2.yaml
+++ b/hie-stack9.2.yaml
@ -1,47 +0,0 @@
-# Symlink this as hie.yaml to make HLS use the stack yaml/ghc mentioned below.
-# This works better than relying on the implicit cradle, which doesn't
-# work with multi-package projects (opening a file from a second package breaks HLS).
-
-# Circa HLS 1.9.1.0, this one (using GHC 9.2) is the only one that works.
-
-cradle:
-  stack:
-    stackYaml: "stack9.2.yaml"
-
-    # since there is a hie.yaml, these must be listed explicitly 
-    # (a current limitation of hls with a multi-package stack project):
-    components:
-    - path: "hledger-lib/"
-      component: "hledger-lib:lib"
-    - path: "hledger-lib/test/doctests.hs"
-      component: "hledger-lib:test:doctest"
-    - path: "hledger-lib/test/unittest.hs"
-      component: "hledger-lib:test:unittest"
-
-    - path: "hledger/"
-      component: "hledger:lib"
-    - path: "hledger/app/"
-      component: "hledger:exe:hledger"
-    - path: "hledger/test/unittest.hs"
-      component: "hledger:test:unittest"
-    - path: "hledger/bench/"
-      component: "hledger:bench:bench"
-
-    - path: "hledger-ui/"
-      component: "hledger-ui:exe:hledger-ui"
-
-    - path: "hledger-web/"
-      component: "hledger-web:lib"
-    - path: "hledger-web/app/"
-      component: "hledger-web:exe:hledger-web"
-    - path: "hledger-web/test/"
-      component: "hledger-web:test:test"
-
-    - path: "bin/"
-      component: "hledger:lib"
-    - path: "tools/"
-      component: "hledger:lib"
-
-    # silences hls error for Shake.hs, but I think also ignores actual errors
-    - path: "Shake.hs"
-      component: "hledger:lib"
--- a/hie.yaml
+++ b/hie.yaml
@ -1 +0,0 @@
-hie-stack9.2.yaml
--- a/hie.yaml
+++ b/hie.yaml
@ -0,0 +1,50 @@
+# Make HLS use the stack yaml file mentioned below.
+# This works better than relying on the implicit cradle, which doesn't
+# work with multi-package projects (opening a file from a second package breaks HLS).
+
+# The stack.yaml below currently uses GHC 9.4.4 which is supported by eg HLS 1.9.1.0.
+# If you need to run with a different version of HLS or different GHC, try using the
+# appropriate stackX.Y.yaml. ghcup tui shows the GHC versions supported by your
+# currently selected HLS.
+
+cradle:
+  stack:
+    stackYaml: "stack.yaml"
+
+    # since there is a hie.yaml, these must be listed explicitly 
+    # (a current limitation of hls with a multi-package stack project):
+    components:
+    - path: "hledger-lib/"
+      component: "hledger-lib:lib"
+    - path: "hledger-lib/test/doctests.hs"
+      component: "hledger-lib:test:doctest"
+    - path: "hledger-lib/test/unittest.hs"
+      component: "hledger-lib:test:unittest"
+
+    - path: "hledger/"
+      component: "hledger:lib"
+    - path: "hledger/app/"
+      component: "hledger:exe:hledger"
+    - path: "hledger/test/unittest.hs"
+      component: "hledger:test:unittest"
+    - path: "hledger/bench/"
+      component: "hledger:bench:bench"
+
+    - path: "hledger-ui/"
+      component: "hledger-ui:exe:hledger-ui"
+
+    - path: "hledger-web/"
+      component: "hledger-web:lib"
+    - path: "hledger-web/app/"
+      component: "hledger-web:exe:hledger-web"
+    - path: "hledger-web/test/"
+      component: "hledger-web:test:test"
+
+    - path: "bin/"
+      component: "hledger:lib"
+    - path: "tools/"
+      component: "hledger:lib"
+
+    # silences hls error for Shake.hs, but I think also ignores actual errors
+    - path: "Shake.hs"
+      component: "hledger:lib"