Skip to content

Commit aee3328

Browse files
authored
ytt: refactor (#350668)
2 parents dc6b1fa + ce9f200 commit aee3328

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed
Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
2-
1+
{
2+
lib,
3+
buildGoModule,
4+
fetchFromGitHub,
5+
installShellFiles,
6+
testers,
7+
ytt,
8+
}:
39
buildGoModule rec {
410
pname = "ytt";
511
version = "0.50.0";
612

713
src = fetchFromGitHub {
8-
owner = "vmware-tanzu";
9-
repo = "carvel-ytt";
14+
owner = "carvel-dev";
15+
repo = "ytt";
1016
rev = "v${version}";
1117
sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4=";
1218
};
@@ -16,23 +22,39 @@ buildGoModule rec {
1622
nativeBuildInputs = [ installShellFiles ];
1723

1824
ldflags = [
19-
"-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}"
25+
"-s"
26+
"-w"
27+
"-X carvel.dev/ytt/pkg/version.Version=${version}"
2028
];
2129

22-
subPackages = [ "cmd/ytt" ];
23-
2430
postInstall = ''
2531
installShellCompletion --cmd ytt \
2632
--bash <($out/bin/ytt completion bash) \
2733
--fish <($out/bin/ytt completion fish) \
2834
--zsh <($out/bin/ytt completion zsh)
2935
'';
3036

37+
# Once `__structuredArgs` is introduced, integrate checks and
38+
# set some regexes `checkFlags = [ "-skip=TestDataValues.*" ]`
39+
# etc. So far we dont test because passing '*' chars through the Go builder
40+
# is flawed.
41+
doCheck = false;
42+
43+
passthru.tests.version = testers.testVersion {
44+
package = ytt;
45+
command = "ytt --version";
46+
inherit version;
47+
};
48+
3149
meta = with lib; {
3250
description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values";
3351
mainProgram = "ytt";
3452
homepage = "https://get-ytt.io";
3553
license = licenses.asl20;
36-
maintainers = with maintainers; [ brodes techknowlogick ];
54+
maintainers = with maintainers; [
55+
brodes
56+
techknowlogick
57+
gabyx
58+
];
3759
};
3860
}

0 commit comments

Comments
 (0)