alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

docker_compose: 1.9.0 -> 1.10.0

Browse source
This commit is contained in:
Lancelot SIX 2017-01-27 12:26:29 +01:00
parent 2aaa39a249
commit bf23aaf893
No known key found for this signature in database
GPG key ID: 02E1542BA66FB047
3 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/python-modules/docker_compose.nix Normal file
View file

@ -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
];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -93,6 +93,8 @@ with pkgs;
dockerTools = callPackage ../build-support/docker { };
docker_compose = pythonPackages.docker_compose;
dotnetenv = callPackage ../build-support/dotnetenv {
dotnetfx = dotnetfx40;
};

38
pkgs/top-level/python-packages.nix
View file

@ -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";