From 9cc633bc97d92e4dcb7d0ecfe221324a8c41788b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 23 Mar 2025 21:03:03 -0500 Subject: [PATCH] vimplugins.coc-nginx: move overrides into nodePackagePlugins --- .../editors/vim/plugins/nodePackagePlugins.nix | 11 +++++++++-- pkgs/applications/editors/vim/plugins/overrides.nix | 7 ------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 3856a7be1958..6abe5ab246df 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -46,13 +46,20 @@ let "coc-wxml" "coc-yaml" "coc-yank" + "coc-nginx" ]; + + packageNameOverrides = { + "coc-nginx" = "@yaegassy/coc-nginx"; + }; + + getPackageName = name: packageNameOverrides.${name} or name; in lib.genAttrs nodePackageNames ( name: buildVimPlugin { pname = name; - inherit (nodePackages.${name}) version meta; - src = "${nodePackages.${name}}/lib/node_modules/${name}"; + inherit (nodePackages.${getPackageName name}) version meta; + src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}"; } ) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 51ac498251f1..b29f7da51709 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -37,7 +37,6 @@ meson, neovim-unwrapped, nim1, - nodePackages, nodejs, notmuch, openscad, @@ -633,12 +632,6 @@ in src = "${coc-pyright}/lib/node_modules/coc-pyright"; }; - coc-nginx = buildVimPlugin { - pname = "coc-nginx"; - inherit (nodePackages."@yaegassy/coc-nginx") version meta; - src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; - }; - coc-toml = buildVimPlugin { pname = "coc-toml"; inherit (coc-toml) version meta;