From d4da0922e3e9da5dbb46ea10fa60221a27e35b0e Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 20 Mar 2024 20:50:30 -0500 Subject: [PATCH 1/2] kubectl-gadget: match ldflags to upstream --- .../applications/networking/cluster/kubectl-gadget/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 436138d8560d..f1ad3733b11e 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -17,7 +17,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X github.com/inspektor-gadget/inspektor-gadget/cmd/common.version=v${version}" + "-X main.gadgetimage=ghcr.io/inspektor-gadget/inspektor-gadget:v${version}" "-extldflags=-static" ]; From cedfe2eb40edc1c292950fbc3f1f5624f4e89a73 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 20 Mar 2024 20:50:32 -0500 Subject: [PATCH 2/2] kubectl-gadget: add devusb to maintainers --- pkgs/applications/networking/cluster/kubectl-gadget/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index f1ad3733b11e..ffc4cc761a8d 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -33,6 +33,6 @@ buildGoModule rec { mainProgram = "kubectl-gadget"; homepage = "https://inspektor-gadget.io"; license = licenses.asl20; - maintainers = with maintainers; [ kranurag7 ]; + maintainers = with maintainers; [ kranurag7 devusb ]; }; }