From 3da1efb27c4e4306bfa071346934a55aaa4f0700 Mon Sep 17 00:00:00 2001 From: Paul Nicholson Date: Sun, 18 Dec 2022 10:26:33 -0800 Subject: [PATCH 1/4] helmfile: 0.145.2 -> 0.149.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b047723342..df9bfab41333f 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.149.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-d3wb1m65TaWrRE23LDytnkBuAcHazfzwTKwINhC9hW0="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorSha256 = "sha256-akxA1AeYuaIKBAgt+u5fWcFYYP1YVMT79l5WwTn1bnI="; doCheck = false; From 44fd01955de1fad19ea13f76761b127b221361dd Mon Sep 17 00:00:00 2001 From: Paul Nicholson Date: Sun, 18 Dec 2022 20:09:38 -0800 Subject: [PATCH 2/4] Fix completions --- .../applications/networking/cluster/helmfile/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index df9bfab41333f..bbdf841c86c40 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -22,9 +22,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' + mkdir completions + $out/bin/helmfile completion bash > completions/helmfile || true + $out/bin/helmfile completion zsh > completions/_helmfile || true + $out/bin/helmfile completion fish > completions/helmfile.fish || true installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash completions/helmfile \ + --zsh completions/_helmfile \ + --fish completions/helmfile.fish ''; meta = { From 93cc4c648db07dcd062d804fe72118dc5a3dae66 Mon Sep 17 00:00:00 2001 From: Paul Nicholson Date: Wed, 11 Jan 2023 11:00:29 -0800 Subject: [PATCH 3/4] Simplify completion generation --- .../networking/cluster/helmfile/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index bbdf841c86c40..f82cc39c1d660 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -22,14 +22,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - mkdir completions - $out/bin/helmfile completion bash > completions/helmfile || true - $out/bin/helmfile completion zsh > completions/_helmfile || true - $out/bin/helmfile completion fish > completions/helmfile.fish || true installShellCompletion --cmd helmfile \ - --bash completions/helmfile \ - --zsh completions/_helmfile \ - --fish completions/helmfile.fish + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { From 8130db983a29e1dddd938f3023e6faef23dd7300 Mon Sep 17 00:00:00 2001 From: Paul Nicholson Date: Tue, 17 Jan 2023 07:55:47 -0800 Subject: [PATCH 4/4] Update to 0.150.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index f82cc39c1d660..fba5d36a42564 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.149.0"; + version = "0.150.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-d3wb1m65TaWrRE23LDytnkBuAcHazfzwTKwINhC9hW0="; + sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y="; }; - vendorSha256 = "sha256-akxA1AeYuaIKBAgt+u5fWcFYYP1YVMT79l5WwTn1bnI="; + vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw="; doCheck = false;