From 4a5460f3d95855a4075a6df3e5ca2977eee899b5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 11 Jun 2023 23:13:38 -0400 Subject: [PATCH 1/3] eks-node-viewer: fix license --- .../applications/networking/cluster/eks-node-viewer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index 044d2d255169..f87236c4aea7 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { description = "Tool to visualize dynamic node usage within a cluster"; homepage = "https://github.com/awslabs/eks-node-viewer"; changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${version}"; - license = licenses.afl20; + license = licenses.asl20; maintainers = [ maintainers.ivankovnatsky ]; }; } From 451d527a2b8994b0118c5e49432b0284c4fd1669 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 11 Jun 2023 23:16:45 -0400 Subject: [PATCH 2/3] eks-node-viewer: fix version --- .../networking/cluster/eks-node-viewer/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index f87236c4aea7..bf57055e1614 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -13,10 +13,18 @@ buildGoModule rec { vendorHash = "sha256-L1lG+b7MiJQvLqZuLdSjh5zAaApvWdi9SZSDPvObW5w="; + ldflags = [ + "-s" + "-w" + "-X=main.builtBy=nixpkgs" + "-X=main.commit=${src.rev}" + "-X=main.version=${version}" + ]; + meta = with lib; { description = "Tool to visualize dynamic node usage within a cluster"; homepage = "https://github.com/awslabs/eks-node-viewer"; - changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${version}"; + changelog = "https://github.com/awslabs/eks-node-viewer/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = [ maintainers.ivankovnatsky ]; }; From 271a8420c7658152cc08a4ffa61a775a2c67669b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 11 Jun 2023 23:17:17 -0400 Subject: [PATCH 3/3] eks-node-viewer: add version test --- .../networking/cluster/eks-node-viewer/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index bf57055e1614..b1d9051f2cfb 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, eks-node-viewer }: buildGoModule rec { pname = "eks-node-viewer"; @@ -21,6 +21,12 @@ buildGoModule rec { "-X=main.version=${version}" ]; + passthru.tests = { + version = testers.testVersion { + package = eks-node-viewer; + }; + }; + meta = with lib; { description = "Tool to visualize dynamic node usage within a cluster"; homepage = "https://github.com/awslabs/eks-node-viewer";