From dc506de1feb30df89ea8acbea675028d5f78fcf6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Nov 2020 13:38:09 +0000 Subject: [PATCH 1/2] kube3d: 3.1.5 -> 3.2.0 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0f39fc5281e..af91f0fe7e6 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.1.5"; + version = "3.2.0"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53"; + sha256 = "0jy0l8rvmwi0qznnvv97v50lfkpc2bwjmbnq4pxnmf9ih970wjwh"; }; buildFlagsArray = '' From feca10b61d727a61aa142ece4b5acd0281c2ed8a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 Nov 2020 13:39:08 +0000 Subject: [PATCH 2/2] kube3d: move to new installShellCompletion style --- pkgs/applications/networking/cluster/kube3d/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index af91f0fe7e6..f6306ef9043 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -23,12 +23,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # TODO: Move to enhanced installShellCompletion when in master: PR #83630 postInstall = '' - $out/bin/k3d completion bash > k3d.bash - $out/bin/k3d completion fish > k3d.fish - $out/bin/k3d completion zsh > _k3d - installShellCompletion k3d.{bash,fish} --zsh _k3d + installShellCompletion --cmd k3d \ + --bash <($out/bin/k3d completion bash) \ + --fish <($out/bin/k3d completion fish) \ + --zsh <($out/bin/k3d completion zsh) ''; vendorSha256 = null;