From 978eeec74ce7bfb9dd7e8bb536522cbad985bdaa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 31 Jan 2023 08:02:59 +1000 Subject: [PATCH] nix-zsh-completions: 0.4.4 -> unstable-2023-01-30 upstream has removed nix command completion https://github.com/nix-community/nix-zsh-completions/compare/0.4.4...6a1bfc024481bdba568f2ced65e02f3a359a7692 --- .../zsh/nix-zsh-completions/default.nix | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 59e9fa8d8d48..73b9b55b0b8a 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -2,26 +2,15 @@ stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - version = "0.4.4"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { - owner = "spwhitt"; + owner = "nix-community"; repo = "nix-zsh-completions"; - rev = version; - sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; + rev = "6a1bfc024481bdba568f2ced65e02f3a359a7692"; + hash = "sha256-aXetjkl5nPuYHHyuX59ywXF+4Xg+PUCV6Y2u+g18gEk="; }; - # https://github.com/spwhitt/nix-zsh-completions/issues/42 - # - # _nix completion is broken. Remove it; _nix provided by the nix - # package will be used instead. It is not sufficient to set low - # meta.priority below if nix is installed in the system profile and - # nix-zsh-completions in an user profile. In that case, the broken - # version takes precedence over the good one. - postPatch = '' - rm _nix - ''; - strictDeps = true; installPhase = '' mkdir -p $out/share/zsh/{site-functions,plugins/nix} @@ -30,9 +19,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/spwhitt/nix-zsh-completions"; + homepage = "https://github.com/nix-community/nix-zsh-completions"; description = "ZSH completions for Nix, NixOS, and NixOps"; - priority = 6; # prevent collisions with nix 2.4's built-in completions license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ];