From a76df901855a68c85027093c53ab8dbfb4b83b7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 05:34:20 +0000 Subject: [PATCH 1/3] eksctl: 0.21.0 -> 0.22.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 4fce8655737..0a05b8b37e9 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa"; + sha256 = "1l7wcx89d7nil5lbr4x2w04lwranz0z83y892v290wv2l0xnmshj"; }; - vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz"; + vendorSha256 = "0fy9m72iciz5pjf2b3323brgi15w6a9fg1m1srpaiay3md87gagg"; subPackages = [ "cmd/eksctl" ]; From 9685a03679b96e9f2f89b7062248b8425f39ebdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Jul 2020 04:20:00 -0500 Subject: [PATCH 2/3] eksctl: install fish completions --- pkgs/tools/admin/eksctl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0a05b8b37e9..cd343f7fa11 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "eksctl"; @@ -17,11 +17,13 @@ buildGoModule rec { buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = '' - mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} + nativeBuildInputs = [ installShellFiles ]; - $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" - $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" + postInstall = '' + for shell in bash fish zsh; do + $out/bin/eksctl completion $shell > eksctl.$shell + installShellCompletion eksctl.$shell + done ''; meta = with lib; { From 66db082282255f83e5c36cfadd362841a76f8c9f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Jul 2020 04:21:00 -0500 Subject: [PATCH 3/3] eksctl: add ldflags --- pkgs/tools/admin/eksctl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cd343f7fa11..ab309a11a6e 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -17,6 +17,8 @@ buildGoModule rec { buildFlags = [ "-tags netgo" "-tags release" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = ''