From 2aaa39a2499debf7df3241cdd8275812ebfc67b8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 27 Jan 2017 11:32:28 +0100 Subject: [PATCH] pythonPackages.docker: 1.10.6 -> 2.0.2 --- pkgs/development/python-modules/docker.nix | 34 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 35 +--------------------- 2 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/python-modules/docker.nix diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix new file mode 100644 index 000000000000..12c9aac4c23d --- /dev/null +++ b/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 + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d54eef393a7..538ebfbeac4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6164,40 +6164,7 @@ in { }; }; - docker = buildPythonPackage rec { - name = "docker-py-${version}"; - version = "1.10.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ - six - requests2 - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - ]; - - # Flake8 version conflict - doCheck = false; - - meta = { - description = "An API client for docker written in Python"; - homepage = https://github.com/docker/docker-py; - license = licenses.asl20; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker = callPackage ../development/python-modules/docker.nix {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1";