diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 5d7496000268..cdbbda8eb54d 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -4,6 +4,7 @@ coc-clangd, coc-css, coc-diagnostic, + coc-docker, coc-pyright, coc-toml, }: @@ -28,6 +29,11 @@ final: prev: { src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; }; + coc-docker = buildVimPlugin { + inherit (coc-docker) pname version meta; + src = "${coc-docker}/lib/node_modules/coc-docker"; + }; + 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 6abe5ab246df..819f91e56850 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-cmake" - "coc-docker" "coc-emmet" "coc-eslint" "coc-explorer" diff --git a/pkgs/by-name/co/coc-docker/package.nix b/pkgs/by-name/co/coc-docker/package.nix new file mode 100644 index 000000000000..5bc473f46974 --- /dev/null +++ b/pkgs/by-name/co/coc-docker/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-docker"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-docker"; + tag = "v${finalAttrs.version}"; + hash = "sha256-orSwQys+w2TKLau0gROyKh54vq7AwlVLsoU1EzALIDQ="; + }; + + npmDepsHash = "sha256-ow9viEFfyBUM2yDa63+pQCg6R5cAmznanqfI131fRxc="; + + meta = { + description = "Docker language server extension using dockerfile-language-server-nodejs for coc.nvim"; + homepage = "https://github.com/josa42/coc-docker"; + 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 bb541a64d4c6..0653607aa347 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -73,6 +73,7 @@ mapAliases { inherit (pkgs) coc-clangd; # added 2024-06-29 inherit (pkgs) coc-css; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 + inherit (pkgs) coc-docker; # added 2025-10-01 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 1f473a018c11..3085573c84f0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -24,7 +24,6 @@ , "cdktf-cli" , "clipboard-cli" , "coc-cmake" -, "coc-docker" , "coc-emmet" , "coc-eslint" , "coc-explorer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index af270592afa0..52e028faa67c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -15666,24 +15666,6 @@ let sha512 = "ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ=="; }; }; - "dockerfile-ast-0.4.2" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz"; - sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA=="; - }; - }; - "dockerfile-language-server-nodejs-0.9.0" = { - name = "dockerfile-language-server-nodejs"; - packageName = "dockerfile-language-server-nodejs"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.9.0.tgz"; - sha512 = "QPWcUxbbNTaWaRQrJKUBmCXI6iE8l7f81bCVaZizCIkVg4py/4o2mho+AKlLUsZcCml5ss8MkJ257SFV2BZWCg=="; - }; - }; "dockerfile-language-service-0.9.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; @@ -15693,15 +15675,6 @@ let sha512 = "sDUkTR4LUimEAWXDIbUTEx2CytCBlx+XlJkg4B2Ptvak9HkwPD4JpXesaWxXPpp6YHCzxqwsTDY7Gf79ic340g=="; }; }; - "dockerfile-utils-0.10.0" = { - name = "dockerfile-utils"; - packageName = "dockerfile-utils"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.10.0.tgz"; - sha512 = "gnEhxITHpOXNXdlwJgJEq3xnJokm0IZOmrmHlJv8zCB2EDsgZWwdYWuktMMslIywK2YT22gxgZEoFjtEaJqzhQ=="; - }; - }; "dockerode-4.0.4" = { name = "dockerode"; packageName = "dockerode"; @@ -41282,15 +41255,6 @@ let sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; }; }; - "vscode-languageserver-types-3.17.0-next.3" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.0-next.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz"; - sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; - }; - }; "vscode-languageserver-types-3.17.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -48209,50 +48173,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-docker = nodeEnv.buildNodePackage { - name = "coc-docker"; - packageName = "coc-docker"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-docker/-/coc-docker-1.0.2.tgz"; - sha512 = "6As7Y7yhU0aI5UwI/QOuJzmAluoDMUcOcNg0yJZOMsnpjw9ezrPdNMIo+vRImXp1V/STU0j27CztwnH8vofOQQ=="; - }; - dependencies = [ - sources."dockerfile-ast-0.4.2" - sources."dockerfile-language-server-nodejs-0.9.0" - ( - sources."dockerfile-language-service-0.9.0" - // { - dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.3" - ]; - } - ) - sources."dockerfile-utils-0.10.0" - sources."tslib-2.8.1" - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - ( - sources."vscode-languageserver-protocol-3.17.3" - // { - dependencies = [ - sources."vscode-languageserver-types-3.17.3" - ]; - } - ) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "docker extension for coc"; - homepage = "https://github.com/josa42/coc-docker#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet";