zsh-completions: avoid collision with trashy

[Vonfry]

Description of changes

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 23.05 Release Notes (or backporting 22.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[Vonfry]

This pr may break completions for trash-cli.

[hurricanehrndz]

Don't think so since trash-cli includes its own completion as well, if anything this pr will fix another collision

[davidsierradz]

zsh-completions removed _trash completions, but there is not release yet. So we can accept this to resolve the issue right now, or wait until there is a new zsh-completions release: Remove _trash* because trashcli support completion by Freed-Wu · Pull Request #895 · zsh-users/zsh-completions

BTW, to fix collisions for all commands:

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
modified: pkgs/shells/zsh/zsh-completions/default.nix
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@ pkgs/shells/zsh/zsh-completions/default.nix:20 @ stdenv.mkDerivation rec {

     # tmuxp install it so avoid collision
     rm $out/share/zsh/site-functions/_tmuxp
+
+    # trash-cli install it so avoid collision
+    # TODO: remove this after zsh-completions is updated (> 0.34.0)
+    rm $out/share/zsh/site-functions/_trash{,-empty,-list,-restore,-put}
   '';

   meta = {

[Artturin]

zsh-completions removed _trash completions, but there is not release yet. So we can accept this to resolve the issue right now, or wait until there is a new zsh-completions release: Remove _trash* because trashcli support completion by Freed-Wu · Pull Request #895 · zsh-users/zsh-completions

BTW, to fix collisions for all commands:

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
modified: pkgs/shells/zsh/zsh-completions/default.nix
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@ pkgs/shells/zsh/zsh-completions/default.nix:20 @ stdenv.mkDerivation rec {

     # tmuxp install it so avoid collision
     rm $out/share/zsh/site-functions/_tmuxp
+
+    # trash-cli install it so avoid collision
+    # TODO: remove this after zsh-completions is updated (> 0.34.0)
+    rm $out/share/zsh/site-functions/_trash{,-empty,-list,-restore,-put}
   '';

   meta = {

@Vonfry please apply the diff

[Vonfry]

Let us wait for the new release of zsh-completions which will remove _trash. Other fixes, such as the above patch, can be done locally instead of this pr. Artturi ***@***.***> writes:

…

zsh-completions removed _trash completions, but there is not release yet. So we can accept this to resolve the issue right now, or wait until there is a new zsh-completions release: Remove _trash* because trashcli support completion by Freed-Wu · Pull Request #895 · zsh-users/zsh-completions BTW, to fix collisions for all commands: -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- modified: pkgs/shells/zsh/zsh-completions/default.nix -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @ pkgs/shells/zsh/zsh-completions/default.nix:20 @ stdenv.mkDerivation rec { # tmuxp install it so avoid collision rm $out/share/zsh/site-functions/_tmuxp + + # trash-cli install it so avoid collision + # TODO: remove this after zsh-completions is updated (> 0.34.0) + rm $out/share/zsh/site-functions/_trash{,-empty,-list,-restore,-put} ''; meta = { @Vonfry please apply the diff — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.

[Vonfry]

A new release is published. Let us make a pr to update.