Merge pull request #89250 from mayflower/docker-compose-fix-zsh-completion

docker-compose: fix zsh completion
This commit is contained in:
Robin Gloster 2020-05-31 16:04:05 +02:00 committed by GitHub
commit 21680361ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,5 @@
{ stdenv, buildPythonApplication, fetchPypi, pythonOlder { stdenv, buildPythonApplication, fetchPypi, pythonOlder
, installShellFiles
, mock, pytest, nose , mock, pytest, nose
, pyyaml, backports_ssl_match_hostname, colorama, docopt , pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests , dockerpty, docker, ipaddress, jsonschema, requests
@ -17,6 +18,7 @@ buildPythonApplication rec {
# lots of networking and other fails # lots of networking and other fails
doCheck = false; doCheck = false;
nativeBuildInputs = [ installShellFiles ];
checkInputs = [ mock pytest nose ]; checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker pyyaml backports_ssl_match_hostname colorama dockerpty docker
@ -33,11 +35,8 @@ buildPythonApplication rec {
''; '';
postInstall = '' postInstall = ''
install -D -m 0444 contrib/completion/bash/docker-compose \ installShellCompletion --bash contrib/completion/bash/docker-compose
$out/share/bash-completion/completions/docker-compose installShellCompletion --zsh contrib/completion/zsh/_docker-compose
install -D -m 0444 contrib/completion/zsh/_docker-compose \
$out/share/zsh-completion/zsh/site-functions/_docker-compose
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {