Consolidate all cabal.project files (#2866)

Author: pepeiborra

.github/actions/setup-build/action.yml

@@ -121,6 +121,7 @@ runs:
 
     - name: Form the package list ('cabal.project.freeze')
       run: |
+        rm cabal.project.freeze || \
         cabal v2-freeze && \
         echo "" && \
         echo 'Output:' && \

.gitlab-ci.yml

@@ -16,11 +16,11 @@ variables:
     - GHC_VERSION: 8.10.7
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.0.2
-      CABAL_PROJECT: cabal-ghc90.project
+      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:

bindist/ghcs

@@ -1,6 +1,6 @@
 8.6.5,cabal.project
 8.8.4,cabal.project
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
-9.2.1,cabal-ghc92.project
-9.2.2,cabal-ghc92.project
+9.0.2,cabal.project
+9.2.1,cabal.project
+9.2.2,cabal.project

bindist/ghcs-FreeBSD

@@ -1,2 +1,2 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project

bindist/ghcs-Msys

@@ -1,4 +1,4 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
-9.2.2,cabal-ghc92.project
-9.2.1,cabal-ghc92.project
+9.0.2,cabal.project
+9.2.2,cabal.project
+9.2.1,cabal.project

cabal-ghc90.project

@@ -46,12 +46,27 @@ write-ghc-environment-files: never
 index-state: 2022-04-27T09:22:49Z
 
 constraints:
-    hyphenation +embed,
-    -- remove this when hlint sets ghc-lib to true by default
-    -- https://github.com/ndmitchell/hlint/issues/1376
-    hlint +ghc-lib
+  hyphenation +embed,
+  -- remove this when hlint sets ghc-lib to true by default
+  -- https://github.com/ndmitchell/hlint/issues/1376
+  hlint +ghc-lib,
+  ghc-lib-parser-ex -auto,
+  stylish-haskell +ghc-lib
 
 allow-newer:
-    -- for shake-bench
-    Chart-diagrams:diagrams-core,
-    SVGFonts:diagrams-core
+  -- ghc-9.2
+  ----------
+  hiedb:base,
+  retrie:ghc-exactprint,
+
+  -- for brittany
+  -- https://github.com/lspitzner/multistate/pull/8
+  multistate:base,
+  -- https://github.com/lspitzner/data-tree-print/pull/3
+  data-tree-print:base,
+  -- https://github.com/lspitzner/butcher/pull/8
+  butcher:base,
+
+  -- for shake-bench
+  Chart:lens,
+  Chart-diagrams:lens,

cabal-ghc92.project

@@ -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.

cabal.project

@@ -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 --project-file=cabal-ghc90.project
-```
-
 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 --cabal-project cabal-ghc90.project
-```
-
 ### 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.

configuration-ghc-901.nix

@@ -336,17 +336,17 @@
           haskell-language-server-dev = mkDevShell ghcDefault "cabal.project";
           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-ghc90.project";
-          haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project";
+          haskell-language-server-901-dev = mkDevShell ghc901 "cabal.project";
+          haskell-language-server-921-dev = mkDevShell ghc921 "cabal.project";
         };
 
         # Developement shell, haskell packages are also provided by nix
         nixDevShells = {
           haskell-language-server-dev-nix = mkDevShellWithNixDeps ghcDefault "cabal.project";
           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-ghc90.project";
-          haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
+          haskell-language-server-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal.project";
+          haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal.project";
         };
 
         allPackages = {

configuration-ghc-921.nix

@@ -24,7 +24,7 @@ library
   default-language:    Haskell2010
   build-depends:
      base < 4.17, array, bytestring, containers, directory, filepath, transformers
-  if flag(ghc-lib)
+  if flag(ghc-lib) && impl(ghc < 9)
     build-depends: ghc-lib < 9.0
   else
     build-depends: ghc, ghc-boot