From 0dea98463465cf0a3b25894ed3e6a6b6437042b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:33 +0200 Subject: [PATCH 1/6] =?UTF-8?q?ansible:=20v2.9.7=20=E2=86=92=20v2.9.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index b9c710e6888..829b4137d51 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.9.7"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' From c0e6848ad74964ec753fb4f758b0c9e8e246daaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:58 +0200 Subject: [PATCH 2/6] =?UTF-8?q?ansible=5F2=5F8:=20v2.8.11=20=E2=86=92=20v2?= =?UTF-8?q?.8.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d0cb07197cd..adeaa22c360 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; + sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; }; })); From 25233a5db7293c8ca876bfcda3fe35ff119adf2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:27:40 +0200 Subject: [PATCH 3/6] =?UTF-8?q?ansible=5F2=5F7:=20v2.7.17=20=E2=86=92=20v2?= =?UTF-8?q?.7.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index adeaa22c360..b3ecaa3479a 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -17,11 +17,11 @@ rec { ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.17"; + version = "2.7.18"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; + sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); From cabcd8be104f02284f4ff195beb0860e858b85f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:29:02 +0200 Subject: [PATCH 4/6] ansible: default to ansible_2_9 Ansible 2.9 is the latest release and in full support since 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b3ecaa3479a..23879c22710 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,7 @@ { python3Packages, fetchurl }: rec { - ansible = ansible_2_8; + ansible = ansible_2_9; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; From 410fdbada38b3f5821621ac91fa5e59032baac4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:33:21 +0200 Subject: [PATCH 5/6] ansible_2_6: drop Went EOL 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 23879c22710..174aef7c4ba 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -24,14 +24,4 @@ rec { sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); - - ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.6.20"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn"; - }; - })); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8b62553d01..51a758783e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9890,7 +9890,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_6 ansible_2_7 ansible_2_8 ansible_2_9; From 9f98f41854c1e8acb9365058cdd7db404cc475e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:40:20 +0200 Subject: [PATCH 6/6] ansible: add myself as maintainer --- pkgs/development/python-modules/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 829b4137d51..07ae08ada78 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; }