coc-pyright: migrate from nodePackages (#327171)

NixOS · Sep 8, 2024 · ad60caf · ad60caf
2 parents 2b43ce9 + eaff6e7
commit ad60caf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 32 deletions.
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -18,6 +18,7 @@
   arrow-cpp
 , Cocoa
 , coc-diagnostic
+, coc-pyright
 , code-minimap
 , dasht
 , deno
@@ -349,6 +350,12 @@
     src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
   };
 
+  coc-pyright = buildVimPlugin {
+    pname = "coc-pyright";
+    inherit (coc-pyright) version meta;
+    src = "${coc-pyright}/lib/node_modules/coc-pyright";
+  };
+
   coc-nginx = buildVimPlugin {
     pname = "coc-nginx";
     inherit (nodePackages."@yaegassy/coc-nginx") version meta;
@@ -2263,7 +2270,6 @@
       "coc-metals"
       "coc-pairs"
       "coc-prettier"
-      "coc-pyright"
       "coc-python"
       "coc-r-lsp"
       "coc-rls"

diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-pyright";
+  version = "1.1.371";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-pyright";
+    # No tagged releases, this commit corresponds to the latest release of the package.
+    rev = "d4cfda2f530622962a2a6e3ac1ddb2ad83ea2387";
+    hash = "sha256-oNixIW63DhPn2LYJ5t/R4xcReZR3W6nqqFBnCUmo/Wo=";
+  };
+
+  npmDepsHash = "sha256-cTAt02RdQbKurP6H/JWwVp+VpoIysbFt9le9R69+DL4=";
+
+  meta = {
+    description = "Pyright extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-pyright";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
@@ -71,6 +71,7 @@ mapAliases {
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) coc-pyright; # added 2024-07-14
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
@@ -49,7 +49,6 @@
 , "coc-metals"
 , "coc-pairs"
 , "coc-prettier"
-, "coc-pyright"
 , "coc-python"
 , "coc-r-lsp"
 , "coc-rls"

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix