diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/admin/ansible/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/admin/ansible/default.nix | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix index 174aef7c4ba..58b2852baca 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -1,27 +1,32 @@ -{ python3Packages, fetchurl }: +{ python3Packages, fetchurl, fetchFromGitHub }: rec { - ansible = ansible_2_9; + ansible = ansible_2_10; - ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; - - ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { + # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override + # for now. + ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.12"; + version = "2.10.0"; - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; + # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; }; })); - ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { + ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; + + ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.18"; + version = "2.8.14"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; + sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; }; })); } |