From a6e32c105cae8546aa0f03209e9049e1f948f6bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 00:48:55 +0100 Subject: [PATCH 1/5] python3Packages.ansible: 6.5.0 -> 6.6.0 --- 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 bd435fc617e6..81839ecce007 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.5.0"; + version = "6.6.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs="; + sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI="; }; postPatch = '' From f3dd2a89c6daed303cfe94b5056dab051fd9679e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Nov 2022 00:58:09 +0100 Subject: [PATCH 2/5] ansible: 2.13.5 -> 2.14.0 - Init ansible_2_14 at 2.14.0 - ansible_2_13: 2.13.5 -> 2.13.6 - ansible_2_12: 2.12.6 -> 2.12.10 --- .../python-modules/ansible/core.nix | 4 ++-- pkgs/top-level/all-packages.nix | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 5858fa875cd3..b4d09d38f887 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.13.5"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg="; + hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI="; }; # 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 434659693be1..a1639939b9e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16256,14 +16256,20 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_12; - ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core; - ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.12.6"; + 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"; src = oldAttrs.src.override { inherit version; - hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0="; - sha256 = ""; + hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8="; + }; + })); + 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"; })); From beb97ce75aed31a96b4f46baecb8ba8d40f35505 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:16:02 +0100 Subject: [PATCH 3/5] python3Packages.ansible-compat: 2.2.3 -> 2.2.5 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index d2363d3e14a7..f92423fde31a 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.3"; + version = "2.2.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg="; + sha256 = "sha256-KMfFRf1g75wwWc+y/v0n+S2wkf9rWGj4PxIc614f4bU="; }; nativeBuildInputs = [ From a304f169019d701af8d81d0396a95c91334286b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:16:28 +0100 Subject: [PATCH 4/5] python3Packages.ansible-lint: 6.8.5 -> 6.8.6 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 37948ff4ea66..6460c0c923db 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.5"; + version = "6.8.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r+lWJWLp5tGxehhltUDU9xZb8Bz+8q0DA9HK1q05f4g="; + sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24="; }; postPatch = '' From c933e98715d526522818268dc06322634a41a634 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 20 Nov 2022 13:24:40 +0100 Subject: [PATCH 5/5] python3Packages.ansible-runner: 2.3.0 -> 2.3.1 Pass glibcLocales to tests, so locale initialization testing works. --- pkgs/development/python-modules/ansible-runner/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 614bbe28a21c..44e5a519a7bb 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -3,6 +3,7 @@ , ansible-core , buildPythonPackage , fetchPypi +, glibcLocales , mock , openssh , pbr @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs="; + hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { checkInputs = [ ansible-core # required to place ansible CLI onto the PATH in tests + glibcLocales pytestCheckHook pytest-mock pytest-timeout