From 27881a44ceafc1eed63bb7ab4da8a0a98744f16b Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 14 Jun 2024 21:08:44 +0200 Subject: [PATCH] nodePackages.bash-language-server: remove attribute bash-language-server has been packaged outside of nodePackages in #317954, but not correctly removed from nodePackages. --- .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.nix | 55 ------------------- pkgs/development/node-packages/overrides.nix | 8 --- 3 files changed, 64 deletions(-) diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d2b2da19a2dd..20102095ffc9 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -20,7 +20,6 @@ "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; - bash-language-server = "bash-language-server"; cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fb70d6ab2ebf..c8ffc441ade2 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -65546,61 +65546,6 @@ in bypassCache = true; reconstructLock = true; }; - bash-language-server = nodeEnv.buildNodePackage { - name = "bash-language-server"; - packageName = "bash-language-server"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.3.4.tgz"; - sha512 = "9GEzJVOOyU7ZQbDI/uFc8N9FGuun6UZv1qB9bNUbehIb1gA4pOpkIYtqtfSq0XQSO25hMp8d/tzsmFJmeX+dQg=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."braces-3.0.3" - sources."domino-2.1.6" - sources."encoding-0.1.13" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."fuzzy-search-3.2.1" - sources."glob-parent-5.1.2" - sources."iconv-lite-0.6.3" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."node-fetch-2.7.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."turndown-7.1.3" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."web-tree-sitter-0.22.5" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."zod-3.22.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A language server for Bash"; - homepage = "https://github.com/bash-lsp/bash-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 8d9c6e07cb0a..7021dbb0df1e 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -40,14 +40,6 @@ final: prev: { }; }; - bash-language-server = prev.bash-language-server.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/bash-language-server" \ - --prefix PATH : ${lib.makeBinPath [ pkgs.shellcheck ]} - ''; - }; - bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = ''