Skip to content

Commit bb6f909

Browse files
authored
k9s: use finalAttrs, renew, ship skins (#424624)
2 parents b476bae + 78b33f6 commit bb6f909

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

pkgs/by-name/k9/k9s/package.nix

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@
1010
writableTmpDirAsHomeHook,
1111
}:
1212

13-
buildGoModule rec {
13+
buildGoModule (finalAttrs: {
1414
pname = "k9s";
1515
version = "0.50.7";
1616

1717
src = fetchFromGitHub {
1818
owner = "derailed";
1919
repo = "k9s";
20-
rev = "v${version}";
20+
tag = "v${finalAttrs.version}";
2121
hash = "sha256-K0JETHs2vOOfDUPw22x+2O5WN0rtkXsRxMnUHrCpkDg=";
2222
};
2323

2424
ldflags = [
2525
"-s"
26-
"-w"
27-
"-X github.com/derailed/k9s/cmd.version=${version}"
28-
"-X github.com/derailed/k9s/cmd.commit=${src.rev}"
26+
"-X github.com/derailed/k9s/cmd.version=${finalAttrs.version}"
27+
"-X github.com/derailed/k9s/cmd.commit=${finalAttrs.src.rev}"
2928
"-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z"
3029
];
3130

@@ -44,7 +43,7 @@ buildGoModule rec {
4443
tests.version = testers.testVersion {
4544
package = k9s;
4645
command = "HOME=$(mktemp -d) k9s version -s";
47-
inherit version;
46+
inherit (finalAttrs) version;
4847
};
4948
updateScript = nix-update-script { };
5049
};
@@ -60,14 +59,17 @@ buildGoModule rec {
6059
--bash <($out/bin/k9s completion bash) \
6160
--fish <($out/bin/k9s completion fish) \
6261
--zsh <($out/bin/k9s completion zsh)
62+
63+
mkdir -p $out/share/k9s/skins
64+
cp -r $src/skins/* $out/share/k9s/skins/
6365
'';
6466

6567
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
6668

6769
meta = {
6870
description = "Kubernetes CLI To Manage Your Clusters In Style";
6971
homepage = "https://github.com/derailed/k9s";
70-
changelog = "https://github.com/derailed/k9s/releases/tag/v${version}";
72+
changelog = "https://github.com/derailed/k9s/releases/tag/v${finalAttrs.version}";
7173
license = lib.licenses.asl20;
7274
mainProgram = "k9s";
7375
maintainers = with lib.maintainers; [
@@ -79,4 +81,4 @@ buildGoModule rec {
7981
ryan4yin
8082
];
8183
};
82-
}
84+
})

0 commit comments

Comments
 (0)