From 1b7f2e8b3e9887ac130355bcdf449afc5a70e94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Nov 2021 12:14:59 +0100 Subject: [PATCH 1/2] python3Packages.ansible-core.collections: 4.7.0 -> 4.8.0 --- 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 574af6d37957..73362f9359ca 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,8 +23,8 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.7.0"; - sha256 = "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b"; + version = "4.8.0"; + sha256 = "0dlfmvh7jqna6rig39wrnxhklc3k5a3ky3bfq73dqbmcr5hzli8k"; }; in buildPythonPackage rec { From ab8c049e63929ce5e5de1d9672cc0d2f31fc7b0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Nov 2021 12:15:45 +0100 Subject: [PATCH 2/2] python3Packages.ansible-core: 2.11.6 -> 2.12.0 And add an override for ansible_2_11 at 2.11.6. --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- pkgs/tools/admin/ansible/default.nix | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 73362f9359ca..904a94717a97 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.6"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; + sha256 = "sha256-DpBJoauLjFTdyAc43AqytXhwvm/kzU5VhdRxVHq3SxM="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4c66bda06f73..6be403b9e534 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,9 +1,19 @@ -{ python3Packages, fetchurl, fetchFromGitHub }: +{ python3Packages, fetchFromGitHub }: rec { - ansible = ansible_2_11; + ansible = ansible_2_12; - ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core; + + ansible_2_11 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (old: rec { + pname = "ansible-core"; + version = "2.11.6"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; + }; + })); ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base;