From 600c1c753aa4da33bf6f4b1132d13746ff018480 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 3 Sep 2023 19:51:24 -0600
Subject: [PATCH] Bump lsp versions in flake

---
 flake.lock | 18 +++++++++---------
 flake.nix  | 13 ++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index c3d8f1b878b..e64c8ea36e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -134,37 +134,37 @@
     "lsp": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-Uq9OLBZFJvg8BM383++3o3s54Trho6gaYor+6EELV38=",
+        "narHash": "sha256-HcEfdYUrCHufEa+10M2wESjnK41xM/msd+t6r6JwQO0=",
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-2.1.0.0/lsp-2.1.0.0.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-2.1.0.0/lsp-2.1.0.0.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz"
       }
     },
     "lsp-test": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-48gVUVsDPR+RYl+K0ZN15N9EIdTQP8ma5nGPvzE6uoQ=",
+        "narHash": "sha256-E1D3X2+I9ZTZLpHDEDTXexQFYpyG5byOFRIvRTeBsn8=",
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-test-0.15.0.1/lsp-test-0.15.0.1.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-test-0.15.0.1/lsp-test-0.15.0.1.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz"
       }
     },
     "lsp-types": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-irO9uob1L10l1BoRC8F2lABqAzR5Z7mydyCZagMZZ2M=",
+        "narHash": "sha256-Oa5HuKdsdTSQUKtuSt06zVAq19Qxq5IJZObrnPwlB6s=",
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-types-2.0.1.0/lsp-types-2.0.1.0.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://hackage.haskell.org/package/lsp-types-2.0.1.0/lsp-types-2.0.1.0.tar.gz"
+        "url": "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz"
       }
     },
     "nixpkgs": {
diff --git a/flake.nix b/flake.nix
index 5556a814546..f9af7286a52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,15 +51,15 @@
 
     # not sure if this is the correct way to get lsp* packages in
     lsp = {
-      url = "https://hackage.haskell.org/package/lsp-2.1.0.0/lsp-2.1.0.0.tar.gz";
+      url = "https://hackage.haskell.org/package/lsp-2.2.0.0/lsp-2.2.0.0.tar.gz";
       flake = false;
     };
     lsp-types = {
-      url = "https://hackage.haskell.org/package/lsp-types-2.0.1.0/lsp-types-2.0.1.0.tar.gz";
+      url = "https://hackage.haskell.org/package/lsp-types-2.0.2.0/lsp-types-2.0.2.0.tar.gz";
       flake = false;
     };
     lsp-test = {
-      url = "https://hackage.haskell.org/package/lsp-test-0.15.0.1/lsp-test-0.15.0.1.tar.gz";
+      url = "https://hackage.haskell.org/package/lsp-test-0.16.0.0/lsp-test-0.16.0.0.tar.gz";
       flake = false;
     };
 
@@ -244,8 +244,7 @@
           # Theses programs are tools, used as binary, independently of the
           # version of GHC.
           # The drawback of this approach is that our shell may pull two GHC
-          # version in scope (the default one, and the one defined in
-          # `hpkgs`.)
+          # version in scope (the default one, an
           # The advantage is that we won't have to rebuild theses tools (and
           # dependencies) with a recent GHC which may not be supported by
           # them.
@@ -376,7 +375,7 @@
           haskell-language-server-96 = mkExe ghc96;
         };
 
-        devShells = simpleDevShells // nixDevShells // envShells // {
+        devShells2 = simpleDevShells // nixDevShells // envShells // {
           default = simpleDevShells.haskell-language-server-dev;
         };
 
@@ -402,7 +401,7 @@
 
         # The attributes for the default shell and package changed in recent versions of Nix,
         # these are here for backwards compatibility with the old versions.
-        devShell = devShells.default;
+        devShell = devShells2.default;
         defaultPackage = packages.default;
       });