diff --git a/pkgs/by-name/vs/vscode-json-languageserver/package.nix b/pkgs/by-name/vs/vscode-json-languageserver/package.nix new file mode 100644 index 000000000000..c5ec7f4543d1 --- /dev/null +++ b/pkgs/by-name/vs/vscode-json-languageserver/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + typescript, +}: + +buildNpmPackage (finalAttrs: { + pname = "vscode-json-languageserver"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode"; + tag = "1.101.2"; + hash = "sha256-wdI6VlJ4WoSNnwgkb6dkVYcq/P/yzflv5mE9PuYBVx4="; + }; + + sourceRoot = "${finalAttrs.src.name}/extensions/json-language-features/server"; + + npmDepsHash = "sha256-akQukdYTe6um4xo+7T3wHxx+WrXfKYl5a1qwmqX72HQ="; + + nativeBuildInputs = [ typescript ]; + + buildPhase = '' + runHook preBuild + tsc -p . + runHook postBuild + ''; + + dontNpmBuild = true; + + meta = { + description = "JSON language server"; + homepage = "https://github.com/microsoft/vscode/tree/${finalAttrs.src.tag}/extensions/json-language-features/server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ryota2357 ]; + mainProgram = "vscode-json-languageserver"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ba6dfefea5e3..80024647fc3f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -274,6 +274,7 @@ mapAliases { inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + inherit (pkgs) vscode-json-languageserver; # added 2025-06-19 vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-language-server = self.vls; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 1b6c38274635..4f92b30cd720 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -40,5 +40,4 @@ purs-tidy = "purs-tidy"; purty = "purty"; pscid = "pscid"; - vscode-json-languageserver = "vscode-json-languageserver"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 41242fb15fe3..a2ad4054fe62 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -154,7 +154,6 @@ , "vega-cli" , "vega-lite" , "vercel" -, "vscode-json-languageserver" , "wavedrom-cli" , "webpack" , "wring" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3c2e8a7cd7d9..ae9a5b68fc00 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -63785,56 +63785,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-json-languageserver = nodeEnv.buildNodePackage { - name = "vscode-json-languageserver"; - packageName = "vscode-json-languageserver"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageserver/-/vscode-json-languageserver-1.3.4.tgz"; - sha512 = "+ghebnslXk6fVDySBrT0BVqozLDdmKY/qxgkDD4JtOQcU2vXc3e7jh7YyMxvuvE93E9OLvBqUrvajttj8xf3BA=="; - }; - dependencies = [ - sources."agent-base-4.3.0" - sources."debug-3.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-3.3.1" - sources."ms-2.0.0" - sources."request-light-0.4.0" - ( - sources."vscode-json-languageservice-4.2.1" - // { - dependencies = [ - sources."vscode-nls-5.2.0" - ]; - } - ) - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - ( - sources."vscode-languageserver-protocol-3.16.0" - // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - } - ) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-4.1.2" - sources."vscode-uri-3.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON language server"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli";