diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 779c2f122198..ad047a6edec0 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -12,6 +12,7 @@ coc-flutter, coc-git, coc-haxe, + coc-highlight, coc-pyright, coc-sh, coc-spell-checker, @@ -78,6 +79,11 @@ final: prev: { src = "${coc-haxe}/lib/node_modules/coc-haxe"; }; + coc-highlight = buildVimPlugin { + inherit (coc-highlight) pname version meta; + src = "${coc-highlight}/lib/node_modules/coc-highlight"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index ef789c87c9ee..5ea1f4f27b5d 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-highlight" "coc-html" "coc-java" "coc-jest" diff --git a/pkgs/by-name/co/coc-highlight/package.nix b/pkgs/by-name/co/coc-highlight/package.nix new file mode 100644 index 000000000000..1e013743718e --- /dev/null +++ b/pkgs/by-name/co/coc-highlight/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-highlight"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-highlight"; + tag = finalAttrs.version; + hash = "sha256-VksCqyB8b3Bk2BsnYFr6cJINqUzVY+px3TCiWzqFTzE="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-z9pJXGdUXNU8Bfhp7PUPZk7rCCAhnQpcmXUoHUaFAIU="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + yarnBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Highlight extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-highlight"; + 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 index f58b18ef74cd..79a20cc46c01 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -82,6 +82,7 @@ mapAliases { inherit (pkgs) coc-flutter; # Added 2025-11-05 inherit (pkgs) coc-git; # added 2025-10-01 inherit (pkgs) coc-haxe; # Added 2025-11-05 + inherit (pkgs) coc-highlight; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d62643d581f3..e2c788b4009c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-highlight" , "coc-html" , "coc-java" , "coc-jest" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f3018c07041c..944468075c9b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,23 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-highlight = nodeEnv.buildNodePackage { - name = "coc-highlight"; - packageName = "coc-highlight"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-2.0.4.tgz"; - sha512 = "X6VGCqpDML0oRcyH77ANoQ0BAxEsQqVMB9OPbfXB/nSdN3xcO8+M1hNSJm4pBekvywxm6VQUsh/zFD4V55nxLw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Highlight extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html";