From 2e191e2b1a51fb55c816e01261b4460fbcbb749b Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:37:07 -0500 Subject: [PATCH] coc-java: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-java/package.nix | 29 ++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 34 ------------------- 6 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 pkgs/by-name/co/coc-java/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 72041c1658a5..10e1e691cec4 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -14,6 +14,7 @@ coc-haxe, coc-highlight, coc-html, + coc-java, coc-pyright, coc-sh, coc-spell-checker, @@ -90,6 +91,11 @@ final: prev: { src = "${coc-html}/lib/node_modules/coc-html"; }; + coc-java = buildVimPlugin { + inherit (coc-java) pname version meta; + src = "${coc-java}/lib/node_modules/coc-java"; + }; + 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 9c0072aadb14..b1ec84635187 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-java" "coc-jest" "coc-json" "coc-lists" diff --git a/pkgs/by-name/co/coc-java/package.nix b/pkgs/by-name/co/coc-java/package.nix new file mode 100644 index 000000000000..ff4341114e2e --- /dev/null +++ b/pkgs/by-name/co/coc-java/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-java"; + version = "1.26.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-java"; + tag = finalAttrs.version; + hash = "sha256-OKqZk1pt8qt6O+kHYdhAAha5S8YTJBFQPn7oIrjGZgI="; + }; + + npmDepsHash = "sha256-FF7EAf6SvO1sGMIE8FCS7MbnpVwVUwVg0SVUsX+i7zg="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-java"; + 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 f3e7213e750c..9d0b168ef9d7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -85,6 +85,7 @@ mapAliases { inherit (pkgs) coc-highlight; # Added 2025-11-05 inherit (pkgs) coc-html; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) coc-java; # Added 2025-11-05 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 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 23b4797648c1..a20a619a2d51 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-java" , "coc-jest" , "coc-json" , "coc-lists" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a17628a0d3b0..7b2011931045 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,40 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-java = nodeEnv.buildNodePackage { - name = "coc-java"; - packageName = "coc-java"; - version = "1.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.26.1.tgz"; - sha512 = "1hKYhoTtfhVV+tEo/hdWnDMEMMZxSI++wzku/uVPkdqKa69RPUKpSbytFoNoAJYh+Ad2gPOGJWMF7NDJApbkUA=="; - }; - dependencies = [ - sources."anymatch-3.1.3" - sources."binary-extensions-2.3.0" - sources."braces-3.0.3" - sources."chokidar-3.6.0" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."normalize-path-3.0.0" - sources."picomatch-2.3.1" - sources."readdirp-3.6.0" - sources."to-regex-range-5.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Java language extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-java#readme"; - license = "EPL-1.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest";