From d3c201838e2ee8755aa5a6d5b7e5af6241018348 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Nov 2024 17:50:39 +0200
Subject: [PATCH 1/2] python312Packages.jedi-language-server: modernise

- Don't use `with lib;` in `meta`.
- Use modern dependencies arguments to `buildPythonPackage`.
- Don't use `repo = pname` in `src`.
- Use "pyproject = true;" instead of "format = pyproject".
- Reorder inputs to the order they are used, and put them in sections.
---
 .../jedi-language-server/default.nix          | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index c4574b6ea00e1..f08a92c9113a8 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -1,37 +1,45 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  docstring-to-markdown,
   fetchFromGitHub,
+  pythonOlder,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  docstring-to-markdown,
   jedi,
   lsprotocol,
-  poetry-core,
-  pygls,
   pydantic,
-  pyhamcrest,
+  pygls,
+
+  # tests
   pytestCheckHook,
+  pyhamcrest,
   python-lsp-jsonrpc,
-  pythonOlder,
-  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "jedi-language-server";
   version = "0.42.0";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "pappasam";
-    repo = pname;
+    repo = "jedi-language-server";
     rev = "refs/tags/v${version}";
     hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    poetry-core
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     docstring-to-markdown
     jedi
     lsprotocol
@@ -57,12 +65,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "jedi_language_server" ];
 
-  meta = with lib; {
+  meta = {
     description = "Language Server for the latest version(s) of Jedi";
     mainProgram = "jedi-language-server";
     homepage = "https://github.com/pappasam/jedi-language-server";
     changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ doronbehar ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }

From d7249b6c2b1a76b4ecf110ad018cb9a30f155cdf Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 9 Nov 2024 17:54:38 +0200
Subject: [PATCH 2/2] python312Packages.jedi-language-server: fix
 meta.changelog link

---
 .../development/python-modules/jedi-language-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix
index f08a92c9113a8..235c6291275a1 100644
--- a/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     description = "Language Server for the latest version(s) of Jedi";
     mainProgram = "jedi-language-server";
     homepage = "https://github.com/pappasam/jedi-language-server";
-    changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/pappasam/jedi-language-server/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ doronbehar ];
   };