Merge pull request #328188 from GaetanLepage/pylsp

Clean pylsp packages

pkgs/development/python-modules/pyls-isort/default.nix

@@ -9,12 +9,12 @@
 buildPythonPackage rec {
   pname = "pyls-isort";
   version = "0.2.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "pyls-isort";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057";
   };
 
@@ -23,15 +23,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyls_isort" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     isort
     python-lsp-server
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/paradoxxxzero/pyls-isort";
     description = "Isort plugin for python-lsp-server";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cpcloud ];
   };
 }

pkgs/development/python-modules/pyls-memestra/default.nix

@@ -1,7 +1,9 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # dependencies
   deprecated,
   memestra,
   python-lsp-server,
@@ -10,14 +12,16 @@
 buildPythonPackage rec {
   pname = "pyls-memestra";
   version = "0.0.16";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zMVDd2uB4znw38z3yb0Nt7qQH5dGHTbQBIZO/qo1/t8=";
+  src = fetchFromGitHub {
+    owner = "QuantStack";
+    repo = "pyls-memestra";
+    rev = "refs/tags/${version}";
+    hash = "sha256-C1d2BibjpoZCPSy39PkdcLiLIwZZG+XTDWXVjTT1Bws=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     deprecated
     memestra
     python-lsp-server
@@ -28,10 +32,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyls_memestra" ];
 
-  meta = with lib; {
+  meta = {
     description = "Memestra plugin for the Python Language Server";
     homepage = "https://github.com/QuantStack/pyls-memestra";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

pkgs/development/python-modules/pylsp-mypy/default.nix

@@ -1,21 +1,25 @@
 {
   lib,
   buildPythonPackage,
+  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   mypy,
   pytestCheckHook,
   python-lsp-server,
-  pythonOlder,
   tomli,
 }:
 
 buildPythonPackage rec {
   pname = "pylsp-mypy";
   version = "0.6.8";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "python-lsp";
@@ -24,9 +28,9 @@ buildPythonPackage rec {
     hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mypy
     python-lsp-server
     tomli
@@ -41,10 +45,11 @@ buildPythonPackage rec {
     "test_option_overrides_dmypy"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Mypy plugin for the Python LSP Server";
     homepage = "https://github.com/python-lsp/pylsp-mypy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    changelog = "https://github.com/python-lsp/pylsp-mypy/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cpcloud ];
   };
 }

pkgs/development/python-modules/pylsp-rope/default.nix

@@ -1,23 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  rope,
-  pytestCheckHook,
-  python-lsp-server,
   pythonOlder,
+  fetchFromGitHub,
+
+  rope,
+  python-lsp-server,
+
+  # checks
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pylsp-rope";
   version = "0.1.16";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-1oC2iMYKQCV6iELsgIpuDeFZakelMA8irs/caVVQIKc=";
+  src = fetchFromGitHub {
+    owner = "python-rope";
+    repo = "pylsp-rope";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Mr+mWRvOXoy7+SosMae80o0V1jBMn1dEoGmaR/BGHrc=";
   };
 
   propagatedBuildInputs = [
@@ -25,14 +30,15 @@ buildPythonPackage rec {
     python-lsp-server
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
   pythonImportsCheck = [ "pylsp_rope" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
     description = "Extended refactoring capabilities for Python LSP Server using Rope";
     homepage = "https://github.com/python-rope/pylsp-rope";
-    license = licenses.mit;
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/python-rope/pylsp-rope/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

pkgs/development/python-modules/python-lsp-black/default.nix

@@ -1,20 +1,27 @@
 {
   lib,
-  pythonOlder,
   buildPythonPackage,
+  pythonOlder,
   fetchFromGitHub,
-  pytestCheckHook,
   black,
-  python-lsp-server,
-  setuptools,
-  tomli,
   fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  python-lsp-server,
+  tomli,
+
+  # checks
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "python-lsp-black";
   version = "2.0.0";
   pyproject = true;
+
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
@@ -38,22 +45,22 @@ buildPythonPackage rec {
       hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E=";
     });
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     black
     python-lsp-server
   ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   pythonImportsCheck = [ "pylsp_black" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
     homepage = "https://github.com/python-lsp/python-lsp-black";
     description = "Black plugin for the Python LSP Server";
-    changelog = "https://github.com/python-lsp/python-lsp-black/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ cpcloud ];
+    changelog = "https://github.com/python-lsp/python-lsp-black/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ cpcloud ];
   };
 }

pkgs/development/python-modules/python-lsp-ruff/default.nix

@@ -1,13 +1,18 @@
 {
   lib,
-  pythonOlder,
   buildPythonPackage,
-  fetchPypi,
+  pythonOlder,
+  fetchFromGitHub,
+
   ruff,
+
+  # dependencies
   cattrs,
   lsprotocol,
   python-lsp-server,
   tomli,
+
+  # checks
   pytestCheckHook,
 }:
 
@@ -17,10 +22,11 @@ buildPythonPackage rec {
   pyproject = true;
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "python_lsp_ruff";
-    hash = "sha256-P4C9sLSo7iRiRZahz/YLKMw3dxdzcw+b99lG3f+fDKw=";
+  src = fetchFromGitHub {
+    owner = "python-lsp";
+    repo = "python-lsp-ruff";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-czGA/gl7uoWG9UqYUaY9zER79IKfv7ClqgimgyNCAa4=";
   };
 
   postPatch = ''