diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0adddc5fa538..f9f3f0dff68a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -21,6 +21,7 @@ coc-css, coc-diagnostic, coc-pyright, + coc-toml, code-minimap, dasht, deno, @@ -590,6 +591,12 @@ in src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; }; + coc-toml = buildVimPlugin { + pname = "coc-toml"; + inherit (coc-toml) version meta; + src = "${coc-toml}/lib/node_modules/coc-toml"; + }; + codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "codecompanion"; @@ -3711,7 +3718,6 @@ in "coc-sumneko-lua" "coc-tabnine" "coc-texlab" - "coc-toml" "coc-tsserver" "coc-ultisnips" "coc-vetur" diff --git a/pkgs/by-name/co/coc-toml/package.nix b/pkgs/by-name/co/coc-toml/package.nix new file mode 100644 index 000000000000..996b48c5f165 --- /dev/null +++ b/pkgs/by-name/co/coc-toml/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "coc-toml"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "kkiyama117"; + repo = "coc-toml"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iyQRa4h23mfmCmujNYYV8Y+82+HLYUtXgBzU1dtovYc="; + }; + + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + yarnInstallHook + nodejs + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-jZZUrpi3Bg4qQ/NyUDPW7zNuUz/399wAf+gdeZHp+B0="; + }; + + meta = { + description = "toml extension for coc.nvim"; + homepage = "https://github.com/kkiyama117/coc-toml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ soopyc ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 323717173076..6a1059896ef7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -77,6 +77,7 @@ mapAliases { 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 + inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 649468f2e81c..f990a692b0f1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -58,7 +58,6 @@ , "coc-sqlfluff" , "coc-tabnine" , "coc-texlab" -, "coc-toml" , "coc-tsserver" , "coc-ultisnips" , "coc-vetur" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5ddd4fd2c709..aa2d968b5301 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -59455,34 +59455,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-toml = nodeEnv.buildNodePackage { - name = "coc-toml"; - packageName = "coc-toml"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-toml/-/coc-toml-1.2.5.tgz"; - sha512 = "8ypH+v7PkGfYTfg/7QoUGrpgSidzxwr2uvuTXR3FgzWrLT9OQOvlocH9KfCRsP8IIAbCuMOa/OpStN+pNwO6Ug=="; - }; - dependencies = [ - sources."@taplo/lsp-0.2.4" - sources."encoding-0.1.13" - sources."iconv-lite-0.6.3" - sources."node-fetch-2.7.0" - sources."safer-buffer-2.1.2" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "toml extension for coc.nvim"; - homepage = "https://github.com/kkiyama117/coc-toml#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver";