From c3edf8a264e47d33529eea499425bbf17ab00aca Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 13 Aug 2022 18:05:07 -0300 Subject: [PATCH 1/2] zsh-completions: fix code style Signed-off-by: Otavio Salvador --- pkgs/shells/zsh/zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index f75570a46b5b..d5a66e366bd3 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zsh-completions"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - installPhase= '' + installPhase = '' install -D --target-directory=$out/share/zsh/site-functions src/* ''; From c751554a16dd0bca40d46561da768c1d94830368 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 13 Aug 2022 18:06:04 -0300 Subject: [PATCH 2/2] zsh-completions: remove tmuxp completion tmuxp now installs the completion so we need to remove this to avoid a collision. Signed-off-by: Otavio Salvador --- pkgs/shells/zsh/zsh-completions/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index d5a66e366bd3..a108473d373c 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { strictDeps = true; installPhase = '' install -D --target-directory=$out/share/zsh/site-functions src/* + + # tmuxp install it so avoid collision + rm $out/share/zsh/site-functions/_tmuxp ''; meta = {