Merge pull request #103304 from 06kellyjac/kube3d_3.2.0

This commit is contained in:
Wael Nasreddine 2020-11-10 09:48:03 -08:00 committed by GitHub
commit 40a8763237
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "kube3d"; pname = "kube3d";
version = "3.1.5"; version = "3.2.0";
k3sVersion = "1.18.9-k3s1"; k3sVersion = "1.18.9-k3s1";
excludedPackages = ''tools''; excludedPackages = ''tools'';
@ -11,7 +11,7 @@ buildGoModule rec {
owner = "rancher"; owner = "rancher";
repo = "k3d"; repo = "k3d";
rev = "v${version}"; rev = "v${version}";
sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53"; sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh";
}; };
buildFlagsArray = '' buildFlagsArray = ''
@ -23,12 +23,11 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
# TODO: Move to enhanced installShellCompletion when in master: PR #83630
postInstall = '' postInstall = ''
$out/bin/k3d completion bash > k3d.bash installShellCompletion --cmd k3d \
$out/bin/k3d completion fish > k3d.fish --bash <($out/bin/k3d completion bash) \
$out/bin/k3d completion zsh > _k3d --fish <($out/bin/k3d completion fish) \
installShellCompletion k3d.{bash,fish} --zsh _k3d --zsh <($out/bin/k3d completion zsh)
''; '';
vendorSha256 = null; vendorSha256 = null;