From 3b099510456d2c3435314b56a090c1065dd142c5 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 12 Nov 2025 21:43:35 +0000 Subject: [PATCH 1/4] grpc-health-probe: Set upstream tags and ldflags for version --- pkgs/by-name/gr/grpc-health-probe/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index 000995b1879c..ed64b3eb2221 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -15,6 +15,15 @@ buildGoModule rec { hash = "sha256-/7Xxti2QOClWRo6EwHRb369+x/NeT6LHhDDyIJSHv00="; }; + tags = [ + "netgo" + ]; + + ldflags = [ + "-w" + "-X main.versionTag=${version}" + ]; + vendorHash = "sha256-9NDSkfHUa6xfLByjtuDMir2UM5flaKhD6jZDa71D+0w="; meta = with lib; { From db290225ea85a053b66637aae7542ffa3f050d6a Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 12 Nov 2025 21:44:06 +0000 Subject: [PATCH 2/4] grpc-health-probe: Add versionCheckHook --- pkgs/by-name/gr/grpc-health-probe/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index ed64b3eb2221..e7b45e5b8b1b 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -2,6 +2,7 @@ buildGoModule, lib, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -26,6 +27,11 @@ buildGoModule rec { vendorHash = "sha256-9NDSkfHUa6xfLByjtuDMir2UM5flaKhD6jZDa71D+0w="; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = with lib; { description = "command-line tool to perform health-checks for gRPC applications"; homepage = "https://github.com/grpc-ecosystem/grpc-health-probe"; From e5357720669f58029b88805034db9a0bc2090777 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 12 Nov 2025 21:45:06 +0000 Subject: [PATCH 3/4] grpc-health-probe: Add changelog --- pkgs/by-name/gr/grpc-health-probe/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index e7b45e5b8b1b..70802d27b2bb 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -35,6 +35,7 @@ buildGoModule rec { meta = with lib; { description = "command-line tool to perform health-checks for gRPC applications"; homepage = "https://github.com/grpc-ecosystem/grpc-health-probe"; + changelog = "https://github.com/grpc-ecosystem/grpc-health-probe/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ jpds ]; mainProgram = "grpc-health-probe"; From e4bbb49db914b96ad6d38fca1d7fe636c9d4ed31 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Nov 2025 09:30:31 +0000 Subject: [PATCH 4/4] grpc-health-probe: Use finalAttrs --- pkgs/by-name/gr/grpc-health-probe/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index 70802d27b2bb..fe1d47090716 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -5,14 +5,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "grpc-health-probe"; version = "0.4.42"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/7Xxti2QOClWRo6EwHRb369+x/NeT6LHhDDyIJSHv00="; }; @@ -22,7 +22,7 @@ buildGoModule rec { ldflags = [ "-w" - "-X main.versionTag=${version}" + "-X main.versionTag=${finalAttrs.version}" ]; vendorHash = "sha256-9NDSkfHUa6xfLByjtuDMir2UM5flaKhD6jZDa71D+0w="; @@ -35,9 +35,9 @@ buildGoModule rec { meta = with lib; { description = "command-line tool to perform health-checks for gRPC applications"; homepage = "https://github.com/grpc-ecosystem/grpc-health-probe"; - changelog = "https://github.com/grpc-ecosystem/grpc-health-probe/releases/tag/v${version}"; + changelog = "https://github.com/grpc-ecosystem/grpc-health-probe/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; maintainers = with maintainers; [ jpds ]; mainProgram = "grpc-health-probe"; }; -} +})