From 53108d3aae953f604082d75c550a15548c565b9a Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Sun, 6 Mar 2022 11:43:57 +0000
Subject: [PATCH 01/10] Get rid of cabal-ghc90.project

---
 .gitlab-ci.yml          |  2 +-
 bindist/ghcs            |  2 +-
 bindist/ghcs-FreeBSD    |  2 +-
 bindist/ghcs-Msys       |  2 +-
 cabal-ghc90.project     | 58 -----------------------------------------
 cabal.project           |  6 ++---
 docs/troubleshooting.md |  4 +--
 flake.nix               |  4 +--
 8 files changed, 11 insertions(+), 69 deletions(-)
 delete mode 100644 cabal-ghc90.project

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d4ad3ccc5..39025fb2b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ 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
     - GHC_VERSION: 9.2.1
diff --git a/bindist/ghcs b/bindist/ghcs
index 32cfc187ed..154935c5ae 100644
--- a/bindist/ghcs
+++ b/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.0.2,cabal.project
 9.2.1,cabal-ghc92.project
 9.2.2,cabal-ghc92.project
diff --git a/bindist/ghcs-FreeBSD b/bindist/ghcs-FreeBSD
index cab2c69bb2..a1b4b6e0bf 100644
--- a/bindist/ghcs-FreeBSD
+++ b/bindist/ghcs-FreeBSD
@@ -1,2 +1,2 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project
diff --git a/bindist/ghcs-Msys b/bindist/ghcs-Msys
index a6210abe73..37998b56f1 100644
--- a/bindist/ghcs-Msys
+++ b/bindist/ghcs-Msys
@@ -1,4 +1,4 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project
 9.2.2,cabal-ghc92.project
 9.2.1,cabal-ghc92.project
diff --git a/cabal-ghc90.project b/cabal-ghc90.project
deleted file mode 100644
index 06e0d35262..0000000000
--- a/cabal-ghc90.project
+++ /dev/null
@@ -1,58 +0,0 @@
-packages:
-         ./
-         ./hie-compat
-         ./shake-bench
-         ./hls-graph
-         ./ghcide
-         ./hls-plugin-api
-         ./hls-test-utils
-         ./plugins/hls-tactics-plugin
-         ./plugins/hls-brittany-plugin
-         ./plugins/hls-stylish-haskell-plugin
-         ./plugins/hls-fourmolu-plugin
-         ./plugins/hls-class-plugin
-         ./plugins/hls-eval-plugin
-         ./plugins/hls-explicit-imports-plugin
-         ./plugins/hls-refine-imports-plugin
-         ./plugins/hls-hlint-plugin
-         ./plugins/hls-rename-plugin
-         ./plugins/hls-retrie-plugin
-         ./plugins/hls-haddock-comments-plugin
-         ./plugins/hls-splice-plugin
-         ./plugins/hls-qualify-imported-names-plugin
-         ./plugins/hls-floskell-plugin
-         ./plugins/hls-pragmas-plugin
-         ./plugins/hls-module-name-plugin
-         ./plugins/hls-ormolu-plugin
-         ./plugins/hls-call-hierarchy-plugin
-         ./plugins/hls-alternate-number-format-plugin
-         ./plugins/hls-selection-range-plugin
-         ./plugins/hls-change-type-signature-plugin
-
-tests: true
-
-package *
-  ghc-options: -haddock
-  test-show-details: direct
-
-write-ghc-environment-files: never
-
-index-state: 2022-04-27T09:22:49Z
-
-constraints:
-
--- although we are not building all plugins cabal solver phase is run for all packages
--- this way we track explicitly all transitive dependencies which need support for ghc-9
-allow-newer:
-
-  -- brittany: update ghc bounds in hls.cabal when those are removed
-  -- 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,
-
-  -- ghc-9.0.2 specific
-  -- for ghcide:test via ghc-typelits-knownnat
-  ghc-typelits-natnormalise:ghc-bignum
diff --git a/cabal.project b/cabal.project
index ea1114f19a..28c44b6895 100644
--- a/cabal.project
+++ b/cabal.project
@@ -52,6 +52,6 @@ constraints:
     hlint +ghc-lib
 
 allow-newer:
-    -- for shake-bench
-    Chart-diagrams:diagrams-core,
-    SVGFonts:diagrams-core
+  stylish-haskell:Cabal,
+  stylish-haskell:ghc-lib-parser,
+  stylish-haskell:aeson,
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 68642dada1..192ea006f8 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -174,7 +174,7 @@ 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
+cabal update && cabal install pkg:haskell-language-server
 ```
 
 Or with `stack`:
@@ -192,7 +192,7 @@ 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
+ghcup compile hls -v 1.6.1.0 --ghc 9.0.2
 ```
 
 ### Preprocessors
diff --git a/flake.nix b/flake.nix
index 1676dbed47..caed0ff6fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -336,7 +336,7 @@
           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-901-dev = mkDevShell ghc901 "cabal.project";
           haskell-language-server-921-dev = mkDevShell ghc921 "cabal-ghc92.project";
         };
 
@@ -345,7 +345,7 @@
           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-901-dev-nix = mkDevShellWithNixDeps ghc901 "cabal.project";
           haskell-language-server-921-dev-nix = mkDevShellWithNixDeps ghc921 "cabal-ghc92.project";
         };
 

From 6361a45167a4ee6c04812ad7796219680b743e39 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Sun, 6 Mar 2022 13:10:55 +0000
Subject: [PATCH 02/10] fix trailing comma

---
 cabal.project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cabal.project b/cabal.project
index 28c44b6895..1a5332d460 100644
--- a/cabal.project
+++ b/cabal.project
@@ -54,4 +54,4 @@ constraints:
 allow-newer:
   stylish-haskell:Cabal,
   stylish-haskell:ghc-lib-parser,
-  stylish-haskell:aeson,
+  stylish-haskell:aeson

From 2e57e1641d45296a266dc8ab3e90b040084794c4 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Sun, 6 Mar 2022 13:55:36 +0000
Subject: [PATCH 03/10] hie-compat does not need ghc-lib on GHC 9.x

---
 hie-compat/hie-compat.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal
index 13b0cb3ef1..0683c7a628 100644
--- a/hie-compat/hie-compat.cabal
+++ b/hie-compat/hie-compat.cabal
@@ -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

From af27b0ce8c31021bfef683ec35d6d26b45c5c0c5 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Fri, 29 Apr 2022 18:09:40 +0100
Subject: [PATCH 04/10] remove unnecessary allow-newer entries

---
 cabal.project | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cabal.project b/cabal.project
index 1a5332d460..9945257289 100644
--- a/cabal.project
+++ b/cabal.project
@@ -52,6 +52,3 @@ constraints:
     hlint +ghc-lib
 
 allow-newer:
-  stylish-haskell:Cabal,
-  stylish-haskell:ghc-lib-parser,
-  stylish-haskell:aeson

From d599529ac6b72e80aa48f97253ca415b76f7b35e Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Fri, 29 Apr 2022 18:14:26 +0100
Subject: [PATCH 05/10] Get rid of cabal-ghc92.project

---
 cabal-ghc92.project | 93 ---------------------------------------------
 cabal.project       | 32 ++++++++++++++--
 2 files changed, 28 insertions(+), 97 deletions(-)
 delete mode 100644 cabal-ghc92.project

diff --git a/cabal-ghc92.project b/cabal-ghc92.project
deleted file mode 100644
index 136ea7365b..0000000000
--- a/cabal-ghc92.project
+++ /dev/null
@@ -1,93 +0,0 @@
-packages:
-         ./
-         ./hie-compat
-         ./shake-bench
-         ./hls-graph
-         ./ghcide
-         ./hls-plugin-api
-         ./hls-test-utils
-         ./plugins/hls-tactics-plugin
-         ./plugins/hls-brittany-plugin
-         ./plugins/hls-stylish-haskell-plugin
-         ./plugins/hls-fourmolu-plugin
-         ./plugins/hls-class-plugin
-         ./plugins/hls-eval-plugin
-         ./plugins/hls-explicit-imports-plugin
-         ./plugins/hls-refine-imports-plugin
-         ./plugins/hls-hlint-plugin
-         ./plugins/hls-rename-plugin
-         ./plugins/hls-retrie-plugin
-         ./plugins/hls-haddock-comments-plugin
-         ./plugins/hls-splice-plugin
-         ./plugins/hls-qualify-imported-names-plugin
-         ./plugins/hls-floskell-plugin
-         ./plugins/hls-pragmas-plugin
-         ./plugins/hls-module-name-plugin
-         ./plugins/hls-ormolu-plugin
-         ./plugins/hls-call-hierarchy-plugin
-         ./plugins/hls-alternate-number-format-plugin
-         ./plugins/hls-selection-range-plugin
-         ./plugins/hls-change-type-signature-plugin
-
-with-compiler: ghc-9.2.2
-
-tests: true
-
-package *
-  ghc-options: -haddock
-  test-show-details: direct
-
-write-ghc-environment-files: never
-
-index-state: 2022-04-27T09:22:49Z
-
-constraints:
-  -- These plugins don't build/work on GHC92 yet
-  haskell-language-server
-    +ignore-plugins-ghc-bounds
-    -brittany
-    -haddockComments
-    -retrie
-    -splice
-    -tactic,
-  ghc-lib-parser-ex -auto,
-  hlint +ghc-lib,
-  stylish-haskell +ghc-lib
-
-allow-newer:
-  -- for shake-bench
-  Chart:lens,
-  Chart-diagrams:lens,
-
-  -- for head.hackage
-  primitive-unlifted:base,
-
-  brittany:ghc-boot,
-  brittany:ghc-boot-th,
-  brittany:ghc,
-  brittany:ghc-exactprint,
-  brittany:bytestring,
-  brittany:base,
-  -- 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,
-
-  hls-haddock-comments-plugin:ghc-exactprint,
-
-  implicit-hie-cradle:bytestring,
-  implicit-hie-cradle:time,
-
-  -- For tactics
-  ghc-source-gen:ghc,
-
-  -- for ghcide:test via ghc-typelits-knownnat
-  ghc-typelits-natnormalise:ghc-bignum,
-
-  hiedb:base,
-  retrie:ghc-exactprint
-
-allow-older:
-  primitive-extras:primitive-unlifted
diff --git a/cabal.project b/cabal.project
index 9945257289..55c3fc33dd 100644
--- a/cabal.project
+++ b/cabal.project
@@ -46,9 +46,33 @@ 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:
+  -- ghc-9.2
+  ----------
+  hiedb:base,
+  retrie:ghc-exactprint,
+
+  -- for brittany
+  brittany:ghc-boot,
+  brittany:ghc-boot-th,
+  brittany:ghc,
+  brittany:ghc-exactprint,
+  brittany:bytestring,
+  brittany:base,
+  -- 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,

From 912b1cfaff6a824b6cf6c5e64ffff0fb7371a8a9 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Sun, 1 May 2022 22:51:15 +0100
Subject: [PATCH 06/10] hls-haddock-comments-plugin is not buildable with ghc
 9.2

---
 .../hls-haddock-comments-plugin.cabal                     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
index e250aa16be..9acc5e916c 100644
--- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
+++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal
@@ -18,6 +18,10 @@ extra-source-files:
   test/testdata/*.hs
 
 library
+  if impl(ghc >= 9.2)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.HaddockComments
   hs-source-dirs:     src
   ghc-options:
@@ -41,6 +45,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.2)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

From 13783b98bfbf9c2fa0e921fede4e5fb6cd902b47 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Mon, 2 May 2022 11:41:24 +0100
Subject: [PATCH 07/10] clean up references to cabal-ghc92.project and other
 stale docs

---
 .gitlab-ci.yml          |  4 ++--
 bindist/ghcs            |  4 ++--
 bindist/ghcs-Msys       |  4 ++--
 docs/installation.md    |  2 +-
 docs/troubleshooting.md | 14 +-------------
 flake.nix               |  4 ++--
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39025fb2b7..00dc30d913 100644
--- 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
index 154935c5ae..886c529d64 100644
--- 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
index 37998b56f1..b2e04cac3c 100644
--- 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
index 59710c69be..614052b097 100644
--- 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
index 192ea006f8..153f34275a 100644
--- 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
index caed0ff6fe..d7975491b8 100644
--- 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 = {

From ee71a891506b8215e920af194aba5c819358d98a Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Tue, 3 May 2022 19:22:17 +0100
Subject: [PATCH 08/10] rm configuration-ghc.nix files

---
 configuration-ghc-901.nix | 36 ---------------------------
 configuration-ghc-921.nix | 51 ---------------------------------------
 2 files changed, 87 deletions(-)
 delete mode 100644 configuration-ghc-901.nix
 delete mode 100644 configuration-ghc-921.nix

diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix
deleted file mode 100644
index 789a5d2e19..0000000000
--- a/configuration-ghc-901.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# nix version of cabal-ghc901.project
-{ pkgs }:
-
-let
-  disabledPlugins = [
-    "hls-brittany-plugin"
-    "hls-stylish-haskell-plugin"
-  ];
-
-  hpkgsOverride = hself: hsuper:
-    with pkgs.haskell.lib;
-    {
-      hlsDisabledPlugins = disabledPlugins;
-
-      fourmolu = hself.fourmolu_0_4_0_0;
-      primitive-extras = hself.primitive-extras_0_10_1_2;
-
-      # Re-generate HLS drv excluding some plugins
-      haskell-language-server =
-        hself.callCabal2nixWithOptions "haskell-language-server" ./.
-        (pkgs.lib.concatStringsSep " " [
-          "-f-brittany"
-          "-f-stylishhaskell"
-        ]) { };
-
-      # YOLO
-      mkDerivation = args:
-        hsuper.mkDerivation (args // {
-          jailbreak = true;
-          doCheck = false;
-        });
-    };
-in {
-  inherit disabledPlugins;
-  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
-}
diff --git a/configuration-ghc-921.nix b/configuration-ghc-921.nix
deleted file mode 100644
index d8660da1d9..0000000000
--- a/configuration-ghc-921.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# nix version of cabal-ghc901.project
-{ pkgs, inputs }:
-
-let
-  disabledPlugins = [
-    "hls-brittany-plugin"
-    "hls-hlint-plugin"
-    "hls-haddock-comments-plugin"
-    "hls-tactics-plugin"
-    # That one is not technically a plugin, but by putting it in this list, we
-    # get it removed from the top level list of requirement and it is not pull
-    # in the nix shell.
-    "shake-bench"
-  ];
-
-  hpkgsOverride = hself: hsuper:
-    with pkgs.haskell.lib;
-    {
-      hlsDisabledPlugins = disabledPlugins;
-
-      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {};
-      primitive-extras = hself.primitive-extras_0_10_1_2;
-      ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint {};
-      constraints-extras = hself.callCabal2nix "constraints-extras" inputs.constraints-extras {};
-      retrie = hself.callCabal2nix "retrie" inputs.retrie {};
-
-      # Hlint is still broken
-      hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint {});
-      hiedb = hself.hiedb_0_4_1_0;
-
-      # Re-generate HLS drv excluding some plugins
-      haskell-language-server =
-        hself.callCabal2nixWithOptions "haskell-language-server" ./.
-        (pkgs.lib.concatStringsSep " " [
-          "-f-brittany"
-          "-f-hlint"
-          "-f-haddockComments"
-          "-f-tactics"
-        ]) { };
-
-      # YOLO
-      mkDerivation = args:
-        hsuper.mkDerivation (args // {
-          jailbreak = true;
-          doCheck = false;
-        });
-    };
-in {
-  inherit disabledPlugins;
-  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
-}

From acf36030a9c69837e9cf16b02268186f93be1a1e Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Wed, 4 May 2022 18:05:19 +0100
Subject: [PATCH 09/10] Fix wrong allow-newer brittany entries

---
 cabal.project                                         | 6 ------
 plugins/hls-brittany-plugin/hls-brittany-plugin.cabal | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cabal.project b/cabal.project
index 55c3fc33dd..78ceb8e2ff 100644
--- a/cabal.project
+++ b/cabal.project
@@ -60,12 +60,6 @@ allow-newer:
   retrie:ghc-exactprint,
 
   -- for brittany
-  brittany:ghc-boot,
-  brittany:ghc-boot-th,
-  brittany:ghc,
-  brittany:ghc-exactprint,
-  brittany:bytestring,
-  brittany:base,
   -- https://github.com/lspitzner/multistate/pull/8
   multistate:base,
   -- https://github.com/lspitzner/data-tree-print/pull/3
diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
index 28b1f96b6b..9928d1f74b 100644
--- a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
+++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
@@ -17,6 +17,10 @@ extra-source-files:
   test/testdata/**/*.hs
 
 library
+  if impl(ghc >= 9.2)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.Brittany
   hs-source-dirs:   src
   build-depends:
@@ -39,6 +43,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.2)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

From 9195eb636d6a40d36129bce948bdee58a89eeae8 Mon Sep 17 00:00:00 2001
From: Pepe Iborra <pepeiborra@gmail.com>
Date: Wed, 4 May 2022 20:32:48 +0100
Subject: [PATCH 10/10] we should not store cabal freeze files in the CI cache

---
 .github/actions/setup-build/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml
index ef07a3bf17..82d4fbdf69 100644
--- a/.github/actions/setup-build/action.yml
+++ b/.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:' && \