From 1f0c6450b3c33e627a5b93953e7c2d029dca5862 Mon Sep 17 00:00:00 2001 From: Nikita Pedorich Date: Tue, 3 Sep 2024 23:15:02 +0900 Subject: [PATCH 1/2] saml2aws: install shell completion --- pkgs/tools/security/saml2aws/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 72d1580134b4..aedbc5f794fd 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, AppKit }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, AppKit }: buildGoModule rec { pname = "saml2aws"; @@ -13,6 +13,7 @@ buildGoModule rec { vendorHash = "sha256-gtl8T8wXnpLgDZc6qSgFKpA+XbcLNHf20ieBkyNdE+s="; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; subPackages = [ "." "cmd/saml2aws" ]; @@ -21,6 +22,12 @@ buildGoModule rec { "-X main.Version=${version}" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd saml2aws \ + --bash <($out/bin/saml2aws --completion-script-bash) \ + --zsh <($out/bin/saml2aws --completion-script-zsh) + ''; + meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; mainProgram = "saml2aws"; From b2654f9d8ee9cdd2606ae264d2a135568cd723a0 Mon Sep 17 00:00:00 2001 From: Nikita Pedorich Date: Tue, 3 Sep 2024 23:15:38 +0900 Subject: [PATCH 2/2] saml2aws: format with nixfmt-rfc-style --- pkgs/tools/security/saml2aws/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index aedbc5f794fd..14e408275e34 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, AppKit }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + AppKit, +}: buildGoModule rec { pname = "saml2aws"; @@ -16,7 +23,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; - subPackages = [ "." "cmd/saml2aws" ]; + subPackages = [ + "." + "cmd/saml2aws" + ]; ldflags = [ "-X main.Version=${version}" @@ -31,8 +41,8 @@ buildGoModule rec { meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; mainProgram = "saml2aws"; - homepage = "https://github.com/Versent/saml2aws"; - license = licenses.mit; + homepage = "https://github.com/Versent/saml2aws"; + license = licenses.mit; maintainers = [ lib.maintainers.pmyjavec ]; }; }