git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #130232 from 06kellyjac/tektoncd-cli
2daecccSandro
pkgs/applications/networking/cluster/tektoncd-cli/default.nix+5−8
compare with master
unifiedsplit
@@ -2,20 +2,18 @@
2
2
3buildGoModule rec {
3buildGoModule rec {
4 pname = "tektoncd-cli";
4 pname = "tektoncd-cli";
5− version = "0.19.1";
5+ version = "0.20.0";
6
6
7 src = fetchFromGitHub {
7 src = fetchFromGitHub {
8 owner = "tektoncd";
8 owner = "tektoncd";
9 repo = "cli";
9 repo = "cli";
10 rev = "v${version}";
10 rev = "v${version}";
11− sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4=";
11+ sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg=";
12 };
12 };
13
13
14 vendorSha256 = null;
14 vendorSha256 = null;
15
15
16− preBuild = ''
17− buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
16+ ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ];
18− '';
19
17
20 nativeBuildInputs = [ installShellFiles ];
18 nativeBuildInputs = [ installShellFiles ];
21
19
@@ -27,7 +25,7 @@ buildGoModule rec {
27 # Some tests try to write to the home dir
25 # Some tests try to write to the home dir
28 export HOME="$TMPDIR"
26 export HOME="$TMPDIR"
29 # Change the golden files to match our desired version
27 # 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
31 '';
29 '';
32
30
33 postInstall = ''
31 postInstall = ''
@@ -43,8 +41,7 @@ buildGoModule rec {
43 installCheckPhase = ''
41 installCheckPhase = ''
44 runHook preInstallCheck
42 runHook preInstallCheck
45 $out/bin/tkn --help
43 $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}"
48 runHook postInstallCheck
45 runHook postInstallCheck
49 '';
46 '';
50
47