Merge pull request #250058 from dotlambda/dockerfile-language-server-nodejs-buildNpmPackage

dockerfile-language-server-nodejs: use buildNpmPackage

authored by

Robert Schütz and committed by
GitHub
3219721f 7def6073

+30 -34
+1
pkgs/development/node-packages/aliases.nix
··· 60 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 61 inherit (pkgs) cordova; # added 2023-08-18 62 dat = throw "dat was removed because it was broken"; # added 2023-08-21 63 eask = pkgs.eask; # added 2023-08-17 64 inherit (pkgs.elmPackages) elm-test; 65 eslint_d = pkgs.eslint_d; # Added 2023-05-26
··· 60 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 61 inherit (pkgs) cordova; # added 2023-08-18 62 dat = throw "dat was removed because it was broken"; # added 2023-08-21 63 + inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 64 eask = pkgs.eask; # added 2023-08-17 65 inherit (pkgs.elmPackages) elm-test; 66 eslint_d = pkgs.eslint_d; # Added 2023-05-26
-1
pkgs/development/node-packages/main-programs.nix
··· 35 conventional-changelog-cli = "conventional-changelog"; 36 cpy-cli = "cpy"; 37 diff2html-cli = "diff2html"; 38 - dockerfile-language-server-nodejs = "docker-langserver"; 39 fast-cli = "fast"; 40 fauna-shell = "fauna"; 41 fkill-cli = "fkill";
··· 35 conventional-changelog-cli = "conventional-changelog"; 36 cpy-cli = "cpy"; 37 diff2html-cli = "diff2html"; 38 fast-cli = "fast"; 39 fauna-shell = "fauna"; 40 fkill-cli = "fkill";
-1
pkgs/development/node-packages/node-packages.json
··· 105 , "dhcp" 106 , "diagnostic-languageserver" 107 , "diff2html-cli" 108 - , "dockerfile-language-server-nodejs" 109 , "dotenv-cli" 110 , "dotenv-vault" 111 , "elasticdump"
··· 105 , "dhcp" 106 , "diagnostic-languageserver" 107 , "diff2html-cli" 108 , "dotenv-cli" 109 , "dotenv-vault" 110 , "elasticdump"
-32
pkgs/development/node-packages/node-packages.nix
··· 81436 bypassCache = true; 81437 reconstructLock = true; 81438 }; 81439 - dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { 81440 - name = "dockerfile-language-server-nodejs"; 81441 - packageName = "dockerfile-language-server-nodejs"; 81442 - version = "0.10.2"; 81443 - src = fetchurl { 81444 - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.10.2.tgz"; 81445 - sha512 = "vLbaeYv4h3XEzrZ9JOhP6bD1eLzbzGzFFF03F3Ofd6kh9PU2aGBS/LVjd/w1omCyNV2LHviFX0ZGHINmWsZYyw=="; 81446 - }; 81447 - dependencies = [ 81448 - sources."dockerfile-ast-0.5.0" 81449 - sources."dockerfile-language-service-0.10.2" 81450 - sources."dockerfile-utils-0.11.0" 81451 - sources."vscode-jsonrpc-8.1.0" 81452 - sources."vscode-languageserver-8.1.0" 81453 - (sources."vscode-languageserver-protocol-3.17.3" // { 81454 - dependencies = [ 81455 - sources."vscode-languageserver-types-3.17.3" 81456 - ]; 81457 - }) 81458 - sources."vscode-languageserver-textdocument-1.0.10" 81459 - sources."vscode-languageserver-types-3.17.0-next.3" 81460 - ]; 81461 - buildInputs = globalBuildInputs; 81462 - meta = { 81463 - description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies."; 81464 - homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme"; 81465 - license = "MIT"; 81466 - }; 81467 - production = true; 81468 - bypassCache = true; 81469 - reconstructLock = true; 81470 - }; 81471 dotenv-cli = nodeEnv.buildNodePackage { 81472 name = "dotenv-cli"; 81473 packageName = "dotenv-cli";
··· 81436 bypassCache = true; 81437 reconstructLock = true; 81438 }; 81439 dotenv-cli = nodeEnv.buildNodePackage { 81440 name = "dotenv-cli"; 81441 packageName = "dotenv-cli";
+27
pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
···
··· 1 + { lib 2 + , buildNpmPackage 3 + , fetchFromGitHub 4 + }: 5 + 6 + buildNpmPackage rec { 7 + pname = "dockerfile-language-server-nodejs"; 8 + version = "0.10.2"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "rcjsuen"; 12 + repo = "dockerfile-language-server-nodejs"; 13 + rev = "v${version}"; 14 + hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA="; 15 + }; 16 + 17 + npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s="; 18 + 19 + meta = { 20 + changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md"; 21 + description = "A language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies"; 22 + homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs"; 23 + license = lib.licenses.mit; 24 + mainProgram = "docker-langserver"; 25 + maintainers = with lib.maintainers; [ rvolosatovs ]; 26 + }; 27 + }
+2
pkgs/top-level/all-packages.nix
··· 18523 18524 docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { }; 18525 18526 dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { }; 18527 18528 emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };
··· 18523 18524 docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { }; 18525 18526 + dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { }; 18527 + 18528 dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { }; 18529 18530 emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };