From 7a026e746548bcac31adf41e60c2cea066712b75 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 17 Jun 2021 10:40:33 +0200 Subject: [PATCH] rekor-cli, rekor-server: 0.1.1 -> 0.2.0 https://github.com/sigstore/rekor/releases/tag/v0.2.0 --- pkgs/tools/security/rekor/default.nix | 30 ++++++++++----------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index b260d46f934f..b9b49d4e2df0 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -1,21 +1,25 @@ { lib, buildGoModule, fetchFromGitHub }: let - generic = { pname, subPackages, description, postInstall }: + generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "1hvkfvc747g5r4h8vb1d8ikqxmlyxsycnlh78agmmjpxlasspmbk"; + sha256 = "1y6qw55r30jgkcwc6434ly0v9dcfa2lc7z5djn7rjcqrjg3gn7yv"; }; - vendorSha256 = "0vdir9ia3hv27rkm6jnvhsfc3mxw36xfvwqnfd34rgzmzcfxlrbv"; + vendorSha256 = "1wlh505ypwyr91wi80fpbap3far3fljwjd4mql2qcqgg0b1yay9s"; - inherit subPackages postInstall; + subPackages = [ packageToBuild ]; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/rekor/${packageToBuild}/app.gitVersion=v${version}") + ''; meta = with lib; { inherit description; @@ -28,24 +32,12 @@ let in { rekor-cli = generic { pname = "rekor-cli"; - subPackages = [ "cmd/cli" ]; - # Will not be needed with the next version, the package as been renamed upstream - postInstall = '' - if [ -f "$out/bin/cli" ]; then - mv "$out/bin/cli" "$out/bin/rekor-client" - fi - ''; + packageToBuild = "cmd/rekor-cli"; description = "CLI client for Sigstore, the Signature Transparency Log"; }; rekor-server = generic { pname = "rekor-server"; - subPackages = [ "cmd/server" ]; - # Will not be needed with the next version, the package as been renamed upstream - postInstall = '' - if [ -f "$out/bin/server" ]; then - mv "$out/bin/server" "$out/bin/rekor-server" - fi - ''; + packageToBuild = "cmd/rekor-server"; description = "Sigstore server, the Signature Transparency Log"; }; }