From 3c0b4d62a10151912b2b2d466229c2646d69407d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 10 Aug 2024 16:51:31 +0200 Subject: [PATCH 1/3] bash-language-server: add version test --- pkgs/by-name/ba/bash-language-server/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index 46fd2fe26608..8b32874a30da 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -5,6 +5,7 @@ , nodejs , makeBinaryWrapper , shellcheck +, versionCheckHook }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pnpm_8.configHook makeBinaryWrapper + versionCheckHook ]; buildPhase = '' runHook preBuild @@ -60,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + meta = with lib; { description = "A language server for Bash"; homepage = "https://github.com/bash-lsp/bash-language-server"; From d1e42ebf09484f81202f5877087a328dd085a150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 10 Aug 2024 16:52:08 +0200 Subject: [PATCH 2/3] bash-language-server: fix build phase --- pkgs/by-name/ba/bash-language-server/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index 8b32874a30da..c814124e5064 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - pnpm --filter=bash-language-server build + pnpm compile server runHook postBuild ''; From f327119de8f8a53f55479683db617268b639bdd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 10 Aug 2024 16:52:31 +0200 Subject: [PATCH 3/3] bash-language-server: allow user to override shellcheck --- pkgs/by-name/ba/bash-language-server/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index c814124e5064..4b045a8fde43 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { # Create the executable, based upon what happens in npmHooks.npmInstallHook makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ - --prefix PATH : ${lib.makeBinPath [ shellcheck ]} \ + --suffix PATH : ${lib.makeBinPath [ shellcheck ]} \ --inherit-argv0 \ --add-flags $out/lib/bash-language-server/out/cli.js