Merge pull request #8349 from berdario/ansible-win

Add support for Windows in ansible
This commit is contained in:
lethalman 2015-06-17 16:09:37 +02:00
commit ff3972b217
2 changed files with 37 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, python }:
{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
pythonPackages.buildPythonPackage rec {
version = "1.9.1";
@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [
paramiko jinja2 pyyaml httplib2 boto six
];
] ++ stdenv.lib.optional windowsSupport pywinrm;
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"

View File

@ -10594,6 +10594,24 @@ let
};
};
pywinrm = buildPythonPackage (rec {
name = "pywinrm";
src = pkgs.fetchgit {
url = https://github.com/diyan/pywinrm.git;
rev = "c9ce62d500007561ab31a8d0a5d417e779fb69d9";
sha256 = "0n0qlcgin2g5lpby07qbdlnpq5v2qc2yns9zc4zm5prwh2mhs5za";
};
propagatedBuildInputs = with self; [ xmltodict isodate ];
meta = {
homepage = "http://github.com/diyan/pywinrm/";
description = "Python library for Windows Remote Management";
license = licenses.mit;
};
});
pyxattr = buildPythonPackage (rec {
name = "pyxattr-0.5.1";
@ -13537,6 +13555,23 @@ let
};
});
xmltodict = buildPythonPackage (rec {
name = "xmltodict-0.9.2";
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/x/xmltodict/${name}.tar.gz";
sha256 = "00crqnjh1kbvcgfnn3b8c7vq30lf4ykkxp1xf3pf7mswr5l1wp97";
};
buildInputs = with self; [ coverage nose ];
meta = {
description = "Makes working with XML feel like you are working with JSON";
homepage = https://github.com/martinblech/xmltodict;
license = licenses.mit;
};
});
youtube-dl = callPackage ../tools/misc/youtube-dl {
# Release versions don't need pandoc because the formatted man page
# is included in the tarball.