ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 06:08:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22201 from lsix/update_docker_compose

Browse Source 
Update docker compose
This commit is contained in:
Jascha Geerds 2017-02-02 00:39:04 +01:00 committed by GitHub
commit 888be22aee
4 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/python-modules/docker.nix Normal file
View File

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

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

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

73
pkgs/top-level/python-packages.nix
View File

@ -6189,40 +6189,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";
@ -11073,43 +11040,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";