diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2020-08-17 13:35:58 +0200 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-08-21 10:44:50 -0700 |
commit | 38b7da9144e1a3502b57f061df8c829cdc182778 (patch) | |
tree | 9879add408b8c8732531e39e827ee1b3488ad50c | |
parent | 7ab4ee96132b5f54cc0566d5292207d1f68cbb8d (diff) |
ansible: 2.9.12 -> 2.10.0
-rw-r--r-- | pkgs/tools/admin/ansible/default.nix | 19 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4783e98204dda..88346c3606c9f 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,22 @@ -{ python3Packages, fetchurl }: +{ python3Packages, fetchurl, fetchFromGitHub }: rec { - ansible = ansible_2_9; + ansible = ansible_2_10; + + # 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.10.0"; + + # 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_9 = python3Packages.toPythonApplication python3Packages.ansible; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce5dde18de8a..e33aebd9b9308 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10264,7 +10264,8 @@ in ansible ansible_2_7 ansible_2_8 - ansible_2_9; + ansible_2_9 + ansible_2_10; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; |