From e00fef3256c40b5d96a0b42cda5ce6ebf4f1c9a8 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Sun, 14 Jan 2024 17:19:50 +0100 Subject: [PATCH 1/2] jq-lsp: unstable-2023-10-27 -> 0.1.2 --- .../tools/language-servers/jq-lsp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix index 08e83763fd09..c3ea2cd3a5ef 100644 --- a/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -3,18 +3,18 @@ , fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "jq-lsp"; - version = "unstable-2023-10-27"; + version = "0.1.2"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; - rev = "b4707e7776a4eb3093b1a7533ebd41368240095a"; - hash = "sha256-AU4xGweeFx+kSsrqkTtSjl+N77cITF/qvAVZGUZY5SE="; + rev = "refs/tags/v${version}"; + hash = "sha256-a3ZqVWG7kjWQzL1efrKc4s4D14qD/+6JM26vaduxhWg="; }; - vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; + vendorHash = "sha256-bIe006I1ryvIJ4hC94Ux2YVdlmDIM4oZaK/qXafYYe0="; meta = with lib; { description = "jq language server"; From 68db973dd84a6e74d2b25a4eeea1a41b58284597 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Tue, 30 Jan 2024 19:22:41 +0100 Subject: [PATCH 2/2] jq-lsp: use upstream go flags --- .../tools/language-servers/jq-lsp/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix index c3ea2cd3a5ef..13f852790662 100644 --- a/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -16,6 +16,17 @@ buildGoModule rec { vendorHash = "sha256-bIe006I1ryvIJ4hC94Ux2YVdlmDIM4oZaK/qXafYYe0="; + # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml + CGO_ENABLED = 0; + GOFLAGS = [ "-trimpath" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + "-X main.builtBy=Nix" + ]; + meta = with lib; { description = "jq language server"; homepage = "https://github.com/wader/jq-lsp";