From 0bff5a7843827e5e7f5d1b8211072d6fa6454e18 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Feb 2021 17:56:49 +1000 Subject: [PATCH] containerd: move completion to installPhase docker uses containerd 1.4 since b451286b1f56a65ad37fb606b7a77e73b10911e5 --- pkgs/applications/virtualization/containerd/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 695109fd8a4..1d84da72c94 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -40,13 +40,8 @@ buildGoPackage rec { installPhase = '' install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] - ''; - - # completion installed separately so it can be overridden in docker - # can be moved to installPhase when docker uses containerd >= 1.4 - postInstall = '' - installShellFiles --bash contrib/autocomplete/ctr - installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete ''; passthru.tests = { inherit (nixosTests) docker; };