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

dockerfile-language-server-nodejs: use buildNpmPackage
This commit is contained in:
Robert Schütz 2023-09-03 19:08:48 +00:00 committed by GitHub
commit 3219721f12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 34 deletions

View file

@ -60,6 +60,7 @@ mapAliases {
inherit (pkgs) configurable-http-proxy; # added 2023-08-19
inherit (pkgs) cordova; # added 2023-08-18
dat = throw "dat was removed because it was broken"; # added 2023-08-21
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

View file

@ -35,7 +35,6 @@
conventional-changelog-cli = "conventional-changelog";
cpy-cli = "cpy";
diff2html-cli = "diff2html";
dockerfile-language-server-nodejs = "docker-langserver";
fast-cli = "fast";
fauna-shell = "fauna";
fkill-cli = "fkill";

View file

@ -105,7 +105,6 @@
, "dhcp"
, "diagnostic-languageserver"
, "diff2html-cli"
, "dockerfile-language-server-nodejs"
, "dotenv-cli"
, "dotenv-vault"
, "elasticdump"

View file

@ -81436,38 +81436,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";

View file

@ -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 ];
};
}

View file

@ -18523,6 +18523,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 { };
emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };