From 23aca337c697741cef40b42c0177126403be8fdc Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Fri, 13 Dec 2024 19:29:49 +0100 Subject: [PATCH 1/2] awsume: install correct Zsh autocompletion --- pkgs/tools/admin/awsume/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix index 267de059adb36..83ca755166d34 100644 --- a/pkgs/tools/admin/awsume/default.nix +++ b/pkgs/tools/admin/awsume/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { postInstall = '' installShellCompletion --cmd awsume \ --bash <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \ - --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['zsh'])") \ + --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \ --fish <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \ rm -f $out/bin/awsume.bat From 4f06df4e3c16918e81b42ba0f35ef7eea4b79634 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Fri, 13 Dec 2024 19:42:47 +0100 Subject: [PATCH 2/2] awsume: substitute path to awsume-autocomplete bin --- pkgs/tools/admin/awsume/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix index 83ca755166d34..1916ebaf1f452 100644 --- a/pkgs/tools/admin/awsume/default.nix +++ b/pkgs/tools/admin/awsume/default.nix @@ -39,6 +39,7 @@ buildPythonApplication rec { postPatch = '' patchShebangs shell_scripts substituteInPlace shell_scripts/{awsume,awsume.fish} --replace-fail "awsumepy" "$out/bin/awsumepy" + substituteInPlace awsume/configure/autocomplete.py --replace-fail "awsume-autocomplete" "$out/bin/awsume-autocomplete" ''; postInstall = ''