From 2aaa39a2499debf7df3241cdd8275812ebfc67b8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 27 Jan 2017 11:32:28 +0100 Subject: [PATCH 1/2] 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 00000000000..12c9aac4c23 --- /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 8d54eef393a..538ebfbeac4 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"; From bf23aaf8933934a66d1f733f3b28a52b54df752b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 27 Jan 2017 12:26:29 +0100 Subject: [PATCH 2/2] docker_compose: 1.9.0 -> 1.10.0 --- .../python-modules/docker_compose.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 38 +-------------- 3 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/docker_compose.nix diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix new file mode 100644 index 00000000000..e6f309155c2 --- /dev/null +++ b/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 + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53a30b81d9..ae380afca17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -93,6 +93,8 @@ with pkgs; dockerTools = callPackage ../build-support/docker { }; + docker_compose = pythonPackages.docker_compose; + dotnetenv = callPackage ../build-support/dotnetenv { dotnetfx = dotnetfx40; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 538ebfbeac4..d2a1f9dee7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11000,43 +11000,7 @@ in { }; }; - docker_compose = buildPythonPackage rec { - version = "1.9.0"; - name = "docker-compose-${version}"; - namePrefix = ""; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq"; - }; - - # lots of networking and other fails - doCheck = false; - buildInputs = with self; [ mock pytest nose ]; - propagatedBuildInputs = with self; [ - requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema cached-property - ]; - - 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 = { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31";