Merge pull request #239476 from CobaltCause/move-ruff-lsp

Move `ruff-lsp` and fix its wrapper

pkgs/development/tools/language-servers/ruff-lsp/default.nix

@@ -53,6 +53,11 @@ buildPythonPackage rec {
   makeWrapperArgs = [
     # prefer ruff from user's PATH, that's usually desired behavior
     "--suffix PATH : ${lib.makeBinPath [ ruff ]}"
+
+    # Unset ambient PYTHONPATH in the wrapper, so ruff-lsp only ever runs with
+    # its own, isolated set of dependencies. This works because the correct
+    # PYTHONPATH is set in the Python script, which runs after the wrapper.
+    "--unset PYTHONPATH"
   ];
 
   meta = with lib; {

pkgs/top-level/all-packages.nix

@@ -17874,6 +17874,8 @@ with pkgs;
 
   rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { };
 
+  ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { };
+
   svls = callPackage ../development/tools/language-servers/svls { };
 
   typst-lsp = callPackage ../development/tools/language-servers/typst-lsp { };

pkgs/top-level/python-aliases.nix

@@ -291,6 +291,7 @@ mapAliases ({
   ruamel_base = ruamel-base; # added 2021-11-01
   ruamel_yaml = ruamel-yaml; # added 2021-11-01
   ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
+  inherit (super.pkgs) ruff-lsp; # added 2023-06-23
   runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
   sapi-python-client = kbcstorage; # added 2022-04-20
   scikitimage = scikit-image; # added 2023-05-14

pkgs/top-level/python-packages.nix

@@ -10857,8 +10857,6 @@ self: super: with self; {
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 
-  ruff-lsp = callPackage ../development/python-modules/ruff-lsp { };
-
   ruffus = callPackage ../development/python-modules/ruffus { };
 
   rules = callPackage ../development/python-modules/rules { };