Merge pull request #145187 from mweinelt/ansible

authored by

Sandro and committed by
GitHub
634f792c c69e5daf

+17 -7
+4 -4
pkgs/development/python-modules/ansible/core.nix
··· 23 23 24 24 let 25 25 ansible-collections = callPackage ./collections.nix { 26 - version = "4.7.0"; 27 - sha256 = "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b"; 26 + version = "4.8.0"; 27 + sha256 = "0dlfmvh7jqna6rig39wrnxhklc3k5a3ky3bfq73dqbmcr5hzli8k"; 28 28 }; 29 29 in 30 30 buildPythonPackage rec { 31 31 pname = "ansible-core"; 32 - version = "2.11.6"; 32 + version = "2.12.0"; 33 33 34 34 src = fetchPypi { 35 35 inherit pname version; 36 - sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; 36 + sha256 = "sha256-DpBJoauLjFTdyAc43AqytXhwvm/kzU5VhdRxVHq3SxM="; 37 37 }; 38 38 39 39 # ansible_connection is already wrapped, so don't pass it through
+13 -3
pkgs/tools/admin/ansible/default.nix
··· 1 - { python3Packages, fetchurl, fetchFromGitHub }: 1 + { python3Packages, fetchFromGitHub }: 2 2 3 3 rec { 4 - ansible = ansible_2_11; 4 + ansible = ansible_2_12; 5 5 6 - ansible_2_11 = python3Packages.toPythonApplication python3Packages.ansible-core; 6 + ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core; 7 + 8 + ansible_2_11 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (old: rec { 9 + pname = "ansible-core"; 10 + version = "2.11.6"; 11 + 12 + src = python3Packages.fetchPypi { 13 + inherit pname version; 14 + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; 15 + }; 16 + })); 7 17 8 18 ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; 9 19