diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
| commit | b0849305d63df6cc0acfe199cec3a997ad3c5a75 (patch) | |
| tree | 6ff64291dec94a85c6e523a3f78da127a7daa1dd /pkgs/applications/virtualization/docker-compose/default.nix | |
| parent | c901f337b8fed63ba0bb53674950ce4c7bf94dcd (diff) | |
| parent | 7e07d142e78656c5f16b18d81ee4eb9444c9b93d (diff) | |
| download | nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.gz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.bz2 nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.lz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.xz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.zst nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications/virtualization/docker-compose/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/docker-compose/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 14c5ec0a416..cf11b693293 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,27 +1,29 @@ { stdenv, buildPythonApplication, fetchPypi, pythonOlder +, installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32, paramiko +, enum34, functools32, paramiko, distro, python-dotenv }: buildPythonApplication rec { - version = "1.25.5"; + version = "1.26.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; + sha256 = "0c3v30z7jlbxm9nxs42vv3nbja0zsppkcd6fnd0mjcm1s60hyssp"; }; # lots of networking and other fails doCheck = false; + nativeBuildInputs = [ installShellFiles ]; checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client - docopt cached-property paramiko + docopt cached-property paramiko distro python-dotenv ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; @@ -33,11 +35,8 @@ buildPythonApplication rec { ''; postInstall = '' - install -D -m 0444 contrib/completion/bash/docker-compose \ - $out/share/bash-completion/completions/docker-compose - - install -D -m 0444 contrib/completion/zsh/_docker-compose \ - $out/share/zsh-completion/zsh/site-functions/_docker-compose + installShellCompletion --bash contrib/completion/bash/docker-compose + installShellCompletion --zsh contrib/completion/zsh/_docker-compose ''; meta = with stdenv.lib; { |