Merge pull request #22201 from lsix/update_docker_compose

Update docker compose

pkgs/development/python-modules/docker.nix

@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchurl
+, six, requests2, websocket_client
+, ipaddress, backports_ssl_match_hostname, docker_pycreds
+}:
+buildPythonPackage rec {
+  name = "docker-${version}";
+  version = "2.0.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/docker/${name}.tar.gz";
+    sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z";
+  };
+
+  propagatedBuildInputs = [
+    six
+    requests2
+    websocket_client
+    ipaddress
+    backports_ssl_match_hostname
+    docker_pycreds
+  ];
+
+  # Flake8 version conflict
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "An API client for docker written in Python";
+    homepage = https://github.com/docker/docker-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}

pkgs/development/python-modules/docker_compose.nix

@@ -0,0 +1,46 @@
+{ stdenv, buildPythonApplication, fetchurl, pythonOlder
+, mock, pytest, nose
+, pyyaml, backports_ssl_match_hostname, colorama, docopt
+, dockerpty, docker, ipaddress, jsonschema, requests2
+, six, texttable, websocket_client, cached-property
+, enum34, functools32
+}:
+buildPythonApplication rec {
+  version = "1.10.0";
+  name = "docker-compose-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
+    sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z";
+  };
+
+  # lots of networking and other fails
+  doCheck = false;
+  buildInputs = [ mock pytest nose ];
+  propagatedBuildInputs = [
+    pyyaml backports_ssl_match_hostname colorama dockerpty docker
+    ipaddress jsonschema requests2 six texttable websocket_client
+    docopt cached-property
+  ] ++
+    stdenv.lib.optional (pythonOlder "3.4") enum34 ++
+    stdenv.lib.optional (pythonOlder "3.2") functools32;
+
+  patchPhase = ''
+    sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/bash-completion/completions/
+    cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://docs.docker.com/compose/";
+    description = "Multi-container orchestration for Docker";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [
+      jgeerds
+    ];
+  };
+}