diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 863fc68dd040882..3b0c4b3335f3c18 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -52,6 +52,7 @@ mapAliases { inherit (pkgs) carto; # added 2023-08-17 castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 + inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 07117e8ad49a545..d85e1a68623b028 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -37,7 +37,6 @@ conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; diff2html-cli = "diff2html"; - dockerfile-language-server-nodejs = "docker-langserver"; fast-cli = "fast"; fauna-shell = "fauna"; firebase-tools = "firebase"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 156e1c5f3c9de64..637db721fd5636d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -113,7 +113,6 @@ , "dhcp" , "diagnostic-languageserver" , "diff2html-cli" -, "dockerfile-language-server-nodejs" , "dotenv-cli" , "dotenv-vault" , "elasticdump" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4d2856fc429bafd..d144981dc1788eb 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -96929,38 +96929,6 @@ in bypassCache = true; reconstructLock = true; }; - dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { - name = "dockerfile-language-server-nodejs"; - packageName = "dockerfile-language-server-nodejs"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.10.2.tgz"; - sha512 = "vLbaeYv4h3XEzrZ9JOhP6bD1eLzbzGzFFF03F3Ofd6kh9PU2aGBS/LVjd/w1omCyNV2LHviFX0ZGHINmWsZYyw=="; - }; - dependencies = [ - sources."dockerfile-ast-0.5.0" - sources."dockerfile-language-service-0.10.2" - sources."dockerfile-utils-0.11.0" - 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.10" - sources."vscode-languageserver-types-3.17.0-next.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies."; - homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-cli = nodeEnv.buildNodePackage { name = "dotenv-cli"; packageName = "dotenv-cli"; diff --git a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix new file mode 100644 index 000000000000000..899efd605e207bf --- /dev/null +++ b/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "dockerfile-language-server-nodejs"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "rcjsuen"; + repo = "dockerfile-language-server-nodejs"; + rev = "v${version}"; + hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA="; + }; + + npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s="; + + meta = { + changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md"; + description = "A language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies"; + homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs"; + license = lib.licenses.mit; + mainProgram = "docker-langserver"; + maintainers = with lib.maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d9a0880fdffa7d..8a88bbfbd39f46f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18345,6 +18345,8 @@ with pkgs; docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { }; + dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { }; + dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { }; fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { };