From 06b93088f4b50bfb4e8746027f4566bf2509a976 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Sat, 13 Jul 2024 22:35:20 +0200 Subject: [PATCH] google-cloud-sdk: fish completions --- pkgs/tools/admin/google-cloud-sdk/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 8a9a26697773..7caa20a82ddb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, installShellFiles, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { buildInputs = [ python ]; - nativeBuildInputs = [ jq makeWrapper ]; + nativeBuildInputs = [ jq makeWrapper installShellFiles ]; patches = [ # For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected @@ -90,6 +90,12 @@ in stdenv.mkDerivation rec { # zsh doesn't load completions from $FPATH without #compdef as the first line sed -i '1 i #compdef gcloud' $out/share/zsh/site-functions/_gcloud + # setup fish completion + installShellCompletion --cmd gcloud \ + --fish <(echo "complete -c gcloud -f -a '(__fish_argcomplete_complete gcloud)'") + installShellCompletion --cmd gsutil \ + --fish <(echo "complete -c gsutil -f -a '(__fish_argcomplete_complete gsutil)'") + # This directory contains compiled mac binaries. We used crcmod from # nixpkgs instead. rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod \