From 1db6ed088587a8783fed13fcb9870960e456a99e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 4 Jun 2023 22:28:55 -0400 Subject: [PATCH 1/2] berglas: fix version --- pkgs/tools/admin/berglas/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 113a98b5650f..97c7cbacba0f 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -38,6 +38,12 @@ buildGoModule rec { vendorHash = "sha256-qcFS07gma7GVxhdrYca0E6rcczNcZmU8JcjjcpEaxp0="; + ldflags = [ + "-s" + "-w" + "-X=github.com/GoogleCloudPlatform/berglas/internal/version.Version=${version}" + ]; + postPatch = skipTestsCommand; meta = with lib; { From c9d6b8a2bac3d3d869533a00629e7924c2695b04 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 4 Jun 2023 22:30:39 -0400 Subject: [PATCH 2/2] berglas: add version test --- pkgs/tools/admin/berglas/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 97c7cbacba0f..f9af2e94c015 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, berglas }: let skipTests = { @@ -46,6 +46,12 @@ buildGoModule rec { postPatch = skipTestsCommand; + passthru.tests = { + version = testers.testVersion { + package = berglas; + }; + }; + meta = with lib; { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas";