public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15766 from elasticdog/ansible2

Browse Source 
ansible2: 2.0.0.2 -> 2.1.0.0
This commit is contained in:
Frederik Rietdijk 2016-05-28 10:23:39 +02:00
commit de070bbe1c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,6 +799,7 @@ in modules // {
ansible = buildPythonPackage rec { ansible = buildPythonPackage rec {
version = "1.9.4"; version = "1.9.4";
name = "ansible-${version}"; name = "ansible-${version}";
disabled = isPy3k;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://releases.ansible.com/ansible/${name}.tar.gz"; url = "https://releases.ansible.com/ansible/${name}.tar.gz";
@ -829,12 +830,13 @@ in modules // {
}; };
ansible2 = buildPythonPackage rec { ansible2 = buildPythonPackage rec {
version = "v2.0.0.2"; version = "2.1.0.0";
name = "ansible-${version}"; name = "ansible-${version}";
disabled = isPy3k;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://releases.ansible.com/ansible/ansible-2.0.0.2.tar.gz"; url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "0a2qgshbpbg2c8rz36jcc5f7zam0j1viqdhc8fqqbarz26chpnr7"; sha256 = "1bfc2xiplpad6f2nwi48y0kps7xqnsll85dlz63cy8k5bysl6d20";
}; };
prePatch = '' prePatch = ''
@ -848,7 +850,7 @@ in modules // {
windowsSupport = true; windowsSupport = true;
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
paramiko jinja2 pyyaml httplib2 boto six paramiko jinja2 pyyaml httplib2 boto six readline
] ++ optional windowsSupport pywinrm; ] ++ optional windowsSupport pywinrm;
meta = with stdenv.lib; { meta = with stdenv.lib; {