public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-20 00:36:40 +00:00
committed by GitHub
parent f558ed1ea5 848226f810
commit abe7db36a4
93 changed files with 2835 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/containerd/default.nix
+2 -7
View File
@@ -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; };