From 99eb9231d4d97c561cca7a5ca7617531eac6c92d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 6 Nov 2019 07:42:55 -0800 Subject: [PATCH] ansible_2_9: init at 2.9.2 --- .../python-modules/ansible/default.nix | 4 ++-- pkgs/tools/admin/ansible/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 96be51e82f0c..df9c5e82cd13 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.8.7"; + version = "2.9.2"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "08vqjk85j0g1x0iad03d7ysws433dikii8j2lr3a1mlx6d186vv8"; + sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; }; prePatch = '' diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 5b724fb0bf90..197543945c2b 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,9 +1,19 @@ { python3Packages, fetchurl }: -{ - ansible = with python3Packages; toPythonApplication ansible; +rec { + ansible = ansible_2_8; - ansible_2_8 = with python3Packages; toPythonApplication ansible; + ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; + + ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec { + pname = "ansible"; + version = "2.8.6"; + + src = fetchurl { + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + sha256 = "0mg3pj9bs9xg3sks2mbdyba9x191d88vavkbr3l264fnr4kkn81i"; + }; + })); ansible_2_7 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0f055a3d916..efefe5d6ca3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9653,7 +9653,9 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible ansible_2_6 - ansible_2_7; + ansible_2_7 + ansible_2_8 + ansible_2_9; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;