diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
| commit | 551fec44673ea023c303335e762f880d3c28646e (patch) | |
| tree | 4d726dc291badc45899c225e36f5315ef7f938ee /pkgs/tools/admin/ansible/default.nix | |
| parent | 3f889f30bee92c3f2d5eaf53e56aef68f61efc4a (diff) | |
| parent | 291de70ed6b736285ae4de6e3e556c0fc86c2348 (diff) | |
| download | nixlib-551fec44673ea023c303335e762f880d3c28646e.tar nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.gz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.bz2 nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.lz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.xz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.zst nixlib-551fec44673ea023c303335e762f880d3c28646e.zip | |
Merge branch 'master' into es6
Diffstat (limited to 'pkgs/tools/admin/ansible/default.nix')
| -rw-r--r-- | pkgs/tools/admin/ansible/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d18fe4eafd34..11671aba633d 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,6 +7,8 @@ let pname = "ansible"; inherit version; + outputs = [ "out" "man" ]; + src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; @@ -16,13 +18,19 @@ let sed -i "s,/usr/,$out," lib/ansible/constants.py ''; + postInstall = '' + for m in docs/man/man1/*; do + install -vD $m -t $man/share/man/man1 + done + ''; + doCheck = false; dontStrip = true; dontPatchELF = true; dontPatchShebangs = false; propagatedBuildInputs = with py.pkgs; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython + pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath ] ++ stdenv.lib.optional windowsSupport pywinrm; meta = with stdenv.lib; { @@ -47,6 +55,11 @@ in rec { sha256 = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59"; }; - ansible2 = ansible_2_5; + ansible_2_6 = generic { + version = "2.6.2"; + sha256 = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl"; + }; + + ansible2 = ansible_2_6; ansible = ansible2; } |