Merge pull request #250287 from dotlambda/javascript-typescript-langserver-buildNpmPackage

javascript-typescript-langserver: use buildNpmPackage

pkgs/development/node-packages/aliases.nix

@@ -59,6 +59,7 @@ mapAliases {
   gtop = pkgs.gtop; # added 2023-07-31
   hueadm = pkgs.hueadm; # added 2023-07-31
   indium = throw "indium was removed because it was broken"; # added 2023-08-19
+  inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29

pkgs/development/node-packages/node-packages.json

@@ -172,7 +172,6 @@
 , "intelephense"
 , "ionic"
 , "jake"
-, "javascript-typescript-langserver"
 , "joplin"
 , "js-beautify"
 , "js-yaml"

pkgs/development/node-packages/node-packages.nix

@@ -109427,93 +109427,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  javascript-typescript-langserver = nodeEnv.buildNodePackage {
-    name = "javascript-typescript-langserver";
-    packageName = "javascript-typescript-langserver";
-    version = "2.11.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.3.tgz";
-      sha512 = "j2dKPq5tgSUyM2AOXWh2O7pNWzXzKI/3W02X1OrEZnV3B9yt9IM+snuGt/mk1Nryxyy7OZnhdL0XqHe4xx7Qzw==";
-    };
-    dependencies = [
-      sources."ansi-color-0.2.1"
-      sources."ansi-styles-3.2.1"
-      sources."any-promise-1.3.0"
-      sources."assertion-error-1.1.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."bufrw-1.3.0"
-      sources."chai-4.3.7"
-      sources."chai-as-promised-7.1.1"
-      sources."chalk-2.4.2"
-      sources."check-error-1.0.2"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."commander-2.20.3"
-      sources."concat-map-0.0.1"
-      sources."deep-eql-4.1.3"
-      sources."error-7.0.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-patch-2.2.1"
-      sources."fs.realpath-1.0.0"
-      sources."get-func-name-2.0.0"
-      sources."glob-7.2.3"
-      sources."has-flag-3.0.0"
-      sources."hexer-1.5.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."iterare-1.2.1"
-      sources."jaeger-client-3.19.0"
-      sources."lodash-4.17.21"
-      sources."long-2.4.0"
-      sources."loupe-2.3.6"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mz-2.7.0"
-      sources."node-int64-0.4.0"
-      sources."object-assign-4.1.1"
-      sources."object-hash-1.3.1"
-      sources."once-1.4.0"
-      sources."opentracing-0.14.7"
-      sources."path-is-absolute-1.0.1"
-      sources."pathval-1.1.1"
-      sources."process-0.10.1"
-      sources."rxjs-5.5.12"
-      sources."semaphore-async-await-1.5.1"
-      sources."string-similarity-2.0.0"
-      sources."string-template-0.2.1"
-      sources."supports-color-5.5.0"
-      sources."symbol-observable-1.0.1"
-      sources."thenify-3.3.1"
-      sources."thenify-all-1.6.0"
-      sources."thriftrw-3.12.0"
-      sources."type-detect-4.0.8"
-      sources."typescript-3.0.3"
-      sources."uuid-8.3.2"
-      sources."vscode-jsonrpc-4.0.0"
-      sources."vscode-languageserver-5.2.1"
-      (sources."vscode-languageserver-protocol-3.14.1" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.14.0"
-        ];
-      })
-      sources."vscode-languageserver-types-3.17.3"
-      sources."vscode-uri-1.0.8"
-      sources."wrappy-1.0.2"
-      sources."xorshift-1.2.0"
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
-      homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";

pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix

@@ -0,0 +1,25 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "javascript-typescript-langserver";
+  version = "2.11.3";
+
+  src = fetchFromGitHub {
+    owner = "sourcegraph";
+    repo = "javascript-typescript-langserver";
+    rev = "v${version}";
+    hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI=";
+  };
+
+  npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA=";
+
+  meta = {
+    description = "JavaScript and TypeScript code intelligence through the Language Server Protocol";
+    homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dywedir ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -18359,6 +18359,8 @@ with pkgs;
 
   helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
 
+  javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
+
   jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { };
 
   jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };