git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130232 from 06kellyjac/tektoncd-cli

tektoncd-cli: 0.19.1 -> 0.20.0

commit2daeccc015013645280accc9e29af5a75ec64c0d authorSandro <sandro.jaeckel@gmail.com> dateThu 15 Jul 2021, 22:08 (5 years ago) parent7d5b18c4d9f1ee
1 file changed+5−8
pkgs/applications/networking/cluster/tektoncd-cli/default.nix+5−8
pkgs/applications/networking/cluster/tektoncd-cli/default.nix+5−8
@@ -2,20 +2,18 @@
22
33buildGoModule rec {
44 pname = "tektoncd-cli";
5− version = "0.19.1";
5+ version = "0.20.0";
66
77 src = fetchFromGitHub {
88 owner = "tektoncd";
99 repo = "cli";
1010 rev = "v${version}";
11− sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4=";
11+ sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg=";
1212 };
1313
1414 vendorSha256 = null;
1515
16− preBuild = ''
17− buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
18− '';
16+ ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ];
1917
2018 nativeBuildInputs = [ installShellFiles ];
2119
@@ -27,7 +25,7 @@ buildGoModule rec {
2725 # Some tests try to write to the home dir
2826 export HOME="$TMPDIR"
2927 # Change the golden files to match our desired version
30− sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden
28+ sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden
3129 '';
3230
3331 postInstall = ''
@@ -43,8 +41,7 @@ buildGoModule rec {
4341 installCheckPhase = ''
4442 runHook preInstallCheck
4543 $out/bin/tkn --help
46− # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389
47− # $out/bin/tkn version | grep "Client version: ${version}"
44+ $out/bin/tkn version | grep "Client version: ${version}"
4845 runHook postInstallCheck
4946 '';
5047