From 99912bbf0e082cac9edbb8074c6b962057b43d3b Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Mon, 15 Jun 2015 19:24:02 +0100 Subject: [PATCH] Add (optional, but opted in by default) support for Windows in ansible --- pkgs/tools/system/ansible/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 374528872e8e..c23d10d20ee5 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -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" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38fda4ad4065..3d4aa343b53e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10508,6 +10508,18 @@ 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 ]; + }); + pyxattr = buildPythonPackage (rec { name = "pyxattr-0.5.1"; @@ -13451,6 +13463,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; + }; + }); + zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2";