Merge pull request #164430 from mweinelt/ansible

Ansible: 2.10.16 -> 2.10.17; 2.12.2 -> 2.12.3; Collections: 5.2.0 -> 5.5.0
This commit is contained in:
Florian Klink 2022-03-18 13:24:45 +01:00 committed by GitHub
commit 1df253a01f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View file

@ -28,11 +28,11 @@ let
in
buildPythonPackage rec {
pname = "ansible-base";
version = "2.10.16";
version = "2.10.17";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2XQhTtA6wSnCmZZ6pMmCBZQ7o28gBA5/63JI4MPi6hU=";
sha256 = "sha256-75JYgsqNTDwszQkc3hmeDIaQJMytDQejN9zyB7/zLzQ=";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -23,17 +23,17 @@
let
ansible-collections = callPackage ./collections.nix {
version = "5.2.0";
sha256 = "sha256:1jwraha3s15s692d47kgcr7jy1ngbg6ipmkb0ak7fjnb57r4im66";
version = "5.5.0";
sha256 = "sha256-uKdtc3iJyb/Q5rDyJ23PjYNtpmcGejVXdvNQTXpm1Rg=";
};
in
buildPythonPackage rec {
pname = "ansible-core";
version = "2.12.2";
version = "2.12.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:1hz7j8gsgxbfjdf9562cbyxia3c4crdv50fm0p0wp4js79rf2ydw";
sha256 = "sha256-ihNan3TJfKtndZKTdErTQ1D3GVI+i9m7kAjfTPlTryA=";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -18,6 +18,10 @@ buildPythonPackage rec {
lxml
];
# tests broken in expat bump
# https://github.com/Juniper/jxmlease/issues/26
doCheck = false;
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest discover -v