From ab8c049e63929ce5e5de1d9672cc0d2f31fc7b0f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Nov 2021 12:15:45 +0100 Subject: [PATCH] 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 73362f9359c..904a94717a9 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 4c66bda06f7..6be403b9e53 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;