From 41a2be1c25bad9874d7a598edbdfba75ab5698ff Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 25 Jun 2024 23:18:21 -0400 Subject: [PATCH] diagnostic-languageserver: remove from node-packages --- .../di/diagnostic-languageserver/package.json | 33 +++++++ .../di/diagnostic-languageserver/package.nix | 41 ++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 95 ------------------- 5 files changed, 75 insertions(+), 96 deletions(-) create mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.json create mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.nix diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.json b/pkgs/by-name/di/diagnostic-languageserver/package.json new file mode 100644 index 000000000000..17483d559a2f --- /dev/null +++ b/pkgs/by-name/di/diagnostic-languageserver/package.json @@ -0,0 +1,33 @@ +{ + "name": "diagnostic-languageserver", + "version": "1.15.0", + "description": "diagnostic language server", + "main": "./lib/index.js", + "repository": "git@github.com:iamcco/diagnostic-languageserver.git", + "author": "iamcco ", + "license": "MIT", + "scripts": { + "build": "tsc -p ./", + "watch": "tsc -w -p ./" + }, + "bin": { + "diagnostic-languageserver": "./bin/index.js" + }, + "dependencies": { + "commander": "^5.1.0", + "find-up": "^4.1.0", + "lodash": "^4.17.15", + "rxjs": "^6.5.5", + "tempy": "^0.7.1", + "tslib": "^1.11.2", + "vscode-languageserver": "^6.1.1", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-uri": "^2.1.1" + }, + "devDependencies": { + "@types/lodash": "^4.14.150", + "@types/node": "^11.11.3", + "ignore": "^5.1.8", + "typescript": "^3.8.3" + } +} diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.nix b/pkgs/by-name/di/diagnostic-languageserver/package.nix new file mode 100644 index 000000000000..81d99c83ac9f --- /dev/null +++ b/pkgs/by-name/di/diagnostic-languageserver/package.nix @@ -0,0 +1,41 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "diagnostic-languageserver"; + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "iamcco"; + repo = "diagnostic-languageserver"; + rev = "v${version}"; + hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + doDist = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "General purpose Language Server that integrate with linter to support diagnostic features"; + homepage = "https://github.com/iamcco/diagnostic-languageserver"; + changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "diagnostic-languageserver"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..cccf1fe4e1fc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -76,6 +76,7 @@ mapAliases { inherit (pkgs) create-react-app; # added 2023-09-25 dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 + inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..ed2ad9ea12f3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -89,7 +89,6 @@ , "cspell" , "csslint" , "dhcp" -, "diagnostic-languageserver" , "diff2html-cli" , "dotenv-cli" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..161305c0c629 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -56449,15 +56449,6 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; - "vscode-languageserver-6.1.1" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; - }; - }; "vscode-languageserver-6.2.0-next.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -68654,92 +68645,6 @@ in bypassCache = true; reconstructLock = true; }; - diagnostic-languageserver = nodeEnv.buildNodePackage { - name = "diagnostic-languageserver"; - packageName = "diagnostic-languageserver"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.15.0.tgz"; - sha512 = "B1kH0j0jOd106t5E14xItYazxFAYOsAvhK+e0+eYW3nOzG3saKFXfkoeJ86T8g2U40lIwo0Jt8xusn8gd34Swg=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."aggregate-error-3.1.0" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."clean-stack-2.2.0" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."crypto-random-string-2.0.0" - sources."del-6.1.1" - sources."dir-glob-3.0.1" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."ignore-5.3.1" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-stream-2.0.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."slash-3.0.0" - sources."temp-dir-2.0.0" - sources."tempy-0.7.1" - sources."to-regex-range-5.0.1" - sources."tslib-1.14.1" - sources."type-fest-0.16.0" - sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-2.1.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "diagnostic language server"; - homepage = "https://github.com/iamcco/diagnostic-languageserver#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; diff2html-cli = nodeEnv.buildNodePackage { name = "diff2html-cli"; packageName = "diff2html-cli";