Merge pull request #130688 from mweinelt/ansible

This commit is contained in:
Sandro 2021-07-20 14:46:37 +02:00 committed by GitHub
commit 4c9be72be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions

View file

@ -28,11 +28,11 @@ let
in
buildPythonPackage rec {
pname = "ansible-base";
version = "2.10.11";
version = "2.10.12";
src = fetchPypi {
inherit pname version;
sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw";
sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg=";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -23,17 +23,17 @@
let
ansible-collections = callPackage ./collections.nix {
version = "4.1.0";
sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm";
version = "4.2.0";
sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk";
};
in
buildPythonPackage rec {
pname = "ansible-core";
version = "2.11.2";
version = "2.11.3";
src = fetchPypi {
inherit pname version;
sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s";
sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ=";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -1,5 +1,5 @@
{ lib
, fetchFromGitHub
, fetchPypi
, buildPythonPackage
, pycrypto
, paramiko
@ -18,13 +18,11 @@
buildPythonPackage rec {
pname = "ansible";
version = "2.9.23";
version = "2.9.24";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o=";
};
prePatch = ''