diff options
| author | Florian Klink <flokli@flokli.de> | 2022-03-18 13:24:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 13:24:45 +0100 |
| commit | 1df253a01f77df4f5d1c78ab74d751f78e874c4d (patch) | |
| tree | 80e4a79715cc1fcbe8b0cbc6a13c55f6c44d9e8e | |
| parent | 795839402209af69dd1c82bb192d79a263c94bb1 (diff) | |
| parent | 0000f2e2ade112be3317449d477eb77c318dfdf0 (diff) | |
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
| -rw-r--r-- | pkgs/development/python-modules/ansible/base.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/ansible/core.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/jxmlease/default.nix | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index a7ab23a36661..173e620703a4 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -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 diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 6b54bd275ba6..fc242ccd10ac 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -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 diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index 727548f21d50..5036ede5e5e9 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -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 |