summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-06-17 16:09:37 +0200
committerlethalman <lucabru@src.gnome.org>2015-06-17 16:09:37 +0200
commitff3972b217132a1e5cbf13d576ba65d500e3fa2b (patch)
treeaa8f6350cf3599b447f08be206420e37b169563f /pkgs/tools
parentf93d8425c3897467798742d5f9ba871dca4a8e47 (diff)
parent32616ae028627dbe12eca4a5199f51a4df0c8a90 (diff)
downloadnixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar.gz
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar.bz2
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar.lz
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar.xz
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.tar.zst
nixlib-ff3972b217132a1e5cbf13d576ba65d500e3fa2b.zip
Merge pull request #8349 from berdario/ansible-win
Add support for Windows in ansible
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/system/ansible/default.nix4
1 files changed, 2 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"