From 0b11411de3658301099f0a4002a893b5d2012ddf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:24:33 +0200 Subject: [PATCH 1/4] ansible_2_14: 2.14.2 -> 2.14.5 https://github.com/ansible/ansible/blob/v2.14.5/changelogs/CHANGELOG-v2.14.rst --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 8f8e98ca6496..dc189f9a871d 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.14.2"; + version = "2.14.5"; src = fetchPypi { inherit pname version; - hash = "sha256-R/DUtBJbWO26ZDWkfzfL5qGNpUWU0Y+BKVi7DLWNTmU="; + hash = "sha256-jE7tds5Fi0o3M0oIAt8pSI7Pn4rzjDERBpyWsXsgVTA="; }; # ansible_connection is already wrapped, so don't pass it through From c5e98218c06fc22517e171a87df9d8373f14dc7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:25:58 +0200 Subject: [PATCH 2/4] ansible_2_13: 2.13.6 -> 2.13.9 https://github.com/ansible/ansible/blob/v2.14.5/changelogs/CHANGELOG-v2.14.rst --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a3bf8528178..04bc154dbb3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17494,10 +17494,10 @@ with pkgs; ansible = ansible_2_14; ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core; ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.13.6"; + version = "2.13.9"; src = oldAttrs.src.override { inherit version; - hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8="; + hash = "sha256-nDGeygqcU83m8XSBLd1xFO2x5dDrXh30e9DY/v7ax2w="; }; })); ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { From 442fee475fd23703a35d36d3f80f1ac6533f5def Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:27:01 +0200 Subject: [PATCH 3/4] ansible_2_12: drop End of life on 2023/05/31. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19f9ced8fc8c..10a24928b78b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -80,6 +80,7 @@ mapAliases ({ amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 + ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04bc154dbb3f..6a1a126081bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17500,14 +17500,6 @@ with pkgs; hash = "sha256-nDGeygqcU83m8XSBLd1xFO2x5dDrXh30e9DY/v7ax2w="; }; })); - ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.12.10"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY="; - }; - meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst"; - })); ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; From 04821cd0d4ef9df0c202c7b85cee9f175c1051de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:30:39 +0200 Subject: [PATCH 4/4] ansible: 2.14.5 -> 2.15.0 https://github.com/ansible/ansible/blob/v2.15.0/changelogs/CHANGELOG-v2.15.rst --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index dc189f9a871d..6b960b8c6b92 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.14.5"; + version = "2.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-jE7tds5Fi0o3M0oIAt8pSI7Pn4rzjDERBpyWsXsgVTA="; + hash = "sha256-z2kP1Ou0BZDgDFrNwGJHWMpMWNHksrAuwCagNAcOv00="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a1a126081bd..11f4977d5236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17491,8 +17491,15 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_14; - ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_15; + ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.14.5"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-jE7tds5Fi0o3M0oIAt8pSI7Pn4rzjDERBpyWsXsgVTA="; + }; + })); ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.13.9"; src = oldAttrs.src.override {