From 821467f51f7b46af19bf946dc68e772719d48406 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 17 Aug 2024 01:33:10 +0200
Subject: [PATCH] ruff-lsp: move to pkgs/by-name and use buildPythonApplication

---
 .../ru/ruff-lsp/package.nix}                  | 21 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 6 insertions(+), 17 deletions(-)
 rename pkgs/{development/tools/language-servers/ruff-lsp/default.nix => by-name/ru/ruff-lsp/package.nix} (83%)

diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/by-name/ru/ruff-lsp/package.nix
similarity index 83%
rename from pkgs/development/tools/language-servers/ruff-lsp/default.nix
rename to pkgs/by-name/ru/ruff-lsp/package.nix
index be327cae1ba0..1fd432a7bb04 100644
--- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix
+++ b/pkgs/by-name/ru/ruff-lsp/package.nix
@@ -1,24 +1,15 @@
 { lib
 , stdenv
-, pythonOlder
-, buildPythonPackage
+, python3
 , fetchFromGitHub
 , ruff
-, pygls
-, lsprotocol
-, hatchling
-, typing-extensions
-, packaging
-, pytestCheckHook
-, python-lsp-jsonrpc
-, pytest-asyncio
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ruff-lsp";
   version = "0.0.54";
   pyproject = true;
-  disabled = pythonOlder "3.7";
+  disabled = python3.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
@@ -32,11 +23,11 @@ buildPythonPackage rec {
     sed -i '/"ruff>=/d' pyproject.toml
   '';
 
-  build-system = [
+  build-system = with python3.pkgs; [
     hatchling
   ];
 
-  dependencies = [
+  dependencies = with python3.pkgs; [
     packaging
     pygls
     lsprotocol
@@ -46,7 +37,7 @@ buildPythonPackage rec {
   # fails in linux sandbox
   doCheck = stdenv.isDarwin;
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
     pytest-asyncio
     python-lsp-jsonrpc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c26167e3528..6b9a2264293d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17382,8 +17382,6 @@ with pkgs;
 
   postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { };
 
-  ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { };
-
   rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { };
 
   svls = callPackage ../development/tools/language-servers/svls { };