From 9f9d9ac0b7aeb0889e5de60c89da674d481df9b7 Mon Sep 17 00:00:00 2001
From: GoodGuyPat <82534925+GoodGuyPat@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:42:22 +0100
Subject: [PATCH] Removed rnix dependencies, as it has been deprecated (#1245)

---
 plugins/lsp/default.nix                  | 2 +-
 plugins/lsp/language-servers/default.nix | 1 +
 tests/test-sources/plugins/lsp/_lsp.nix  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
index 34494597..fda8d21d 100644
--- a/plugins/lsp/default.nix
+++ b/plugins/lsp/default.nix
@@ -79,8 +79,8 @@ in {
         "pylsp"
         "pylyzer"
         "pyright"
-        "rnix-lsp"
         "ruff-lsp"
+        "rnix-lsp"
         "rust-analyzer"
         "solargraph"
         "sourcekit"
diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
index e6b4b6ee..a03f5c19 100644
--- a/plugins/lsp/language-servers/default.nix
+++ b/plugins/lsp/language-servers/default.nix
@@ -543,6 +543,7 @@ with lib; let
       name = "rnix-lsp";
       description = "rnix LSP for Nix";
       serverName = "rnix";
+      package = null;
     }
     {
       name = "ruff-lsp";
diff --git a/tests/test-sources/plugins/lsp/_lsp.nix b/tests/test-sources/plugins/lsp/_lsp.nix
index 1faa1547..99c5d007 100644
--- a/tests/test-sources/plugins/lsp/_lsp.nix
+++ b/tests/test-sources/plugins/lsp/_lsp.nix
@@ -147,7 +147,6 @@
           # https://github.com/mtshiba/pylyzer/issues/78
           pylyzer.enable = false;
           pyright.enable = true;
-          rnix-lsp.enable = false; # Deprecated
           ruff-lsp.enable = true;
           rust-analyzer = {
             enable = true;