From 4c812da8e5dd7d2615848f212eabbf7d4d9f6a33 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 26 Oct 2020 09:20:30 +0000 Subject: [PATCH 1/8] kube3d: add completion for fish fish completion was added in 3.0.2 https://github.com/rancher/k3d/releases/tag/v3.0.2 --- .../applications/networking/cluster/kube3d/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index bb3b7aedd8a..57a41d266e7 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -22,11 +22,13 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; + + # TODO: Move to enhanced installShellCompletion when in master: PR #83630 postInstall = '' - for shell in bash zsh; do - $out/bin/k3d completion $shell > k3d.$shell - installShellCompletion k3d.$shell - done + $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 ''; vendorSha256 = null; From 31ae30a93256f659f1a1dd97b0a63b0807c2d4fd Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 6 Oct 2020 14:23:02 +0100 Subject: [PATCH 2/8] kube3d: 3.0.2 -> 3.1.0 Also bumped k3sVersion --- pkgs/applications/networking/cluster/kube3d/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 57a41d266e7..d0ff42a82d9 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,8 +2,8 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.2"; - k3sVersion = "1.18.6-k3s1"; + version = "3.1.0"; + k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "182n4kggwr6z75vsagfd0rl89ixcw5h13whf56jh4cd38dj8is5l"; + sha256 = "1a3xspyyjp4vgh461q2l30i04ln2l2f7h46dxjrf25ysmlddq2za"; }; buildFlagsArray = '' From caaca24a5758d5f74a0c83adfc6c17a80348e833 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 7 Oct 2020 09:57:44 +0100 Subject: [PATCH 3/8] kube3d: 3.1.0 -> 3.1.1 --- 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 d0ff42a82d9..1b3d1607a5e 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.0"; + version = "3.1.1"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1a3xspyyjp4vgh461q2l30i04ln2l2f7h46dxjrf25ysmlddq2za"; + sha256 = "08ia6qxzdm9snqkcy6g4l7m81yk5k8k940lyfq3czc62i0zc8vg3"; }; buildFlagsArray = '' From f28030496dc980c2ed3ce9724e72d29e354d9e7a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 7 Oct 2020 20:41:07 +0100 Subject: [PATCH 4/8] kube3d: 3.1.1 -> 3.1.2 --- 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 1b3d1607a5e..9c4bddc359f 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.1"; + version = "3.1.2"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "08ia6qxzdm9snqkcy6g4l7m81yk5k8k940lyfq3czc62i0zc8vg3"; + sha256 = "1qfmmglx57yhrrainxfrmmba54sgxj4is9fgpc3p5sr2babxqgnp"; }; buildFlagsArray = '' From 56de13666482fb5fbf3d76e01ba83e87e8c12d77 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 10 Oct 2020 16:49:57 +0100 Subject: [PATCH 5/8] kube3d: 3.1.2 -> 3.1.3 --- 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 9c4bddc359f..92307b0b79f 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.2"; + version = "3.1.3"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1qfmmglx57yhrrainxfrmmba54sgxj4is9fgpc3p5sr2babxqgnp"; + sha256 = "1qwy5h2kgqmyffvnb6q4l4jbavj0lacp46mm2wxrixspadkxg3wm"; }; buildFlagsArray = '' From ba708de8819b6518a38d8b2d89e7119f3d1d8754 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 20 Oct 2020 11:09:18 +0100 Subject: [PATCH 6/8] kube3d: 3.1.3 -> 3.1.4 --- 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 92307b0b79f..c943a585b31 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.3"; + version = "3.1.4"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1qwy5h2kgqmyffvnb6q4l4jbavj0lacp46mm2wxrixspadkxg3wm"; + sha256 = "05895wgikjqs8myn6qachwjapxbra0n4h5n8a05519hvmniv7fnv"; }; buildFlagsArray = '' From 797a3421cd870d52fbe4244c9db5012b2a92ff77 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 22 Oct 2020 09:49:49 +0100 Subject: [PATCH 7/8] kube3d: 3.1.4 -> 3.1.5 --- 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 c943a585b31..2d71960814e 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.4"; + version = "3.1.5"; k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "05895wgikjqs8myn6qachwjapxbra0n4h5n8a05519hvmniv7fnv"; + sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53"; }; buildFlagsArray = '' From aaa2cf6b267cf394bcd15e20c36abdc00fb8c43d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 22 Oct 2020 12:44:18 +0100 Subject: [PATCH 8/8] kube3d: add jk as a maintainer Add jk (myself) as a maintainer to help keeping kube3d working and up-to-date. --- pkgs/applications/networking/cluster/kube3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 2d71960814e..0f39fc5281e 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -40,6 +40,6 @@ buildGoModule rec { description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; + maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ]; }; }