clean up references to cabal-ghc92.project and other stale docs

haskell · May 2, 2022 · cf05dee · cf05dee
1 parent e74f6d8
commit cf05dee
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -18,9 +18,9 @@ variables:
     - GHC_VERSION: 9.0.2
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.2
-      CABAL_PROJECT: cabal-ghc92.project
+      CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.1
-      CABAL_PROJECT: cabal-ghc92.project
+      CABAL_PROJECT: cabal.project
 
 workflow:
   rules:

diff --git a/bindist/ghcs b/bindist/ghcs
@@ -2,5 +2,5 @@
 8.8.4,cabal.project
 8.10.7,cabal.project
 9.0.2,cabal.project
-9.2.1,cabal-ghc92.project
-9.2.2,cabal-ghc92.project
+9.2.1,cabal.project
+9.2.2,cabal.project
diff --git a/bindist/ghcs-Msys b/bindist/ghcs-Msys
@@ -1,4 +1,4 @@
 8.10.7,cabal.project
 9.0.2,cabal.project
-9.2.2,cabal-ghc92.project
-9.2.1,cabal-ghc92.project
+9.2.2,cabal.project
+9.2.1,cabal.project
diff --git a/docs/installation.md b/docs/installation.md
@@ -36,7 +36,7 @@ ghcup compile hls -v 1.6.1.0 --ghc 8.10.7 --ghc 8.8.4
 
 Use a different `cabal.project` for a GHC version:
 ```
-ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal-ghc92.project
+ghcup compile hls -v 1.6.1.0 --ghc 9.2.1 --cabal-project cabal.project
 ```
 
 Check `ghcup compile hls --help` for a full list of compilation options.

diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
@@ -171,16 +171,10 @@ The easiest way to obtain a dynamically linked HLS binary is to build HLS locall
 cabal update && cabal install :pkg:haskell-language-server
 ```
 
-If you are compiling with a ghc version with a specific `cabal-ghc${ghcVersion}.project` in the repo you will have to use it. For example for ghc-9.0.x:
-
-```bash
-cabal update && cabal install pkg:haskell-language-server
-```
-
 Or with `stack`:
 
 ```bash
-stack install haskell-language-server --stack-yaml=stack-${ghcVersion}.yaml
+stack install haskell-language-server
 ```
 
 You also can leverage `ghcup compile hls`:
@@ -189,12 +183,6 @@ You also can leverage `ghcup compile hls`:
 ghcup compile hls -v 1.6.1.0 --ghc 8.10.7
 ```
 
-as it uses cabal underneath you might need to use a specific cabal.project for some ghc versions:
-
-```bash
-ghcup compile hls -v 1.6.1.0 --ghc 9.0.2
-```
-
 ### Preprocessors
 
 HLS is [not yet](https://github.com/haskell/haskell-language-server/issues/176) able to find project preprocessors, which may result in `could not execute: <preprocessor>` errors.

diff --git a/flake.nix b/flake.nix
@@ -337,7 +337,7 @@
           haskell-language-server-884-dev = mkDevShell ghc884 "cabal.project";
           haskell-language-server-8107-dev = mkDevShell ghc8107 "cabal.project";
           haskell-language-server-901-dev = mkDevShell ghc901 "cabal.project";
-          haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project";
+          haskell-language-server-921-dev = mkDevShell ghc921 "cabal.project";
         };
 
         # Developement shell, haskell packages are also provided by nix
@@ -346,7 +346,7 @@
           haskell-language-server-884-dev-nix = mkDevShellWithNixDeps ghc884 "cabal.project";
           haskell-language-server-8107-dev-nix = mkDevShellWithNixDeps ghc8107 "cabal.project";
           haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal.project";
-          haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
+          haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal.project";
         };
 
         allPackages = {