JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #201699 from mweinelt/ansible-2.14

Browse Source 
Ansible 2.14 update
This commit is contained in:
Martin Weinelt 2022-11-21 02:16:40 +01:00 committed by GitHub
commit c36aed83f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/ansible-compat/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ansible-compat";
version = "2.2.3";
version = "2.2.5";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg=";
sha256 = "sha256-KMfFRf1g75wwWc+y/v0n+S2wkf9rWGj4PxIc614f4bU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ansible-lint/default.nix
View File

@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
version = "6.8.5";
version = "6.8.6";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-r+lWJWLp5tGxehhltUDU9xZb8Bz+8q0DA9HK1q05f4g=";
sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24=";
};
postPatch = ''

6
pkgs/development/python-modules/ansible-runner/default.nix
View File

@ -3,6 +3,7 @@
, ansible-core
, buildPythonPackage
, fetchPypi
, glibcLocales
, mock
, openssh
, pbr
@ -20,14 +21,14 @@
buildPythonPackage rec {
pname = "ansible-runner";
version = "2.3.0";
version = "2.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs=";
hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y=";
};
nativeBuildInputs = [
@ -45,6 +46,7 @@ buildPythonPackage rec {
checkInputs = [
ansible-core # required to place ansible CLI onto the PATH in tests
glibcLocales
pytestCheckHook
pytest-mock
pytest-timeout

4
pkgs/development/python-modules/ansible/core.nix
View File

@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "ansible-core";
version = "2.13.5";
version = "2.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-JtzZIY1VRMwVFE9gu1tjTyJ25HbIn0gbP2GcT53vFYg=";
hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI=";
};
# ansible_connection is already wrapped, so don't pass it through

4
pkgs/development/python-modules/ansible/default.nix
View File

@ -20,7 +20,7 @@
let
pname = "ansible";
version = "6.5.0";
version = "6.6.0";
in
buildPythonPackage {
inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs=";
sha256 = "sha256-4blAqNT0EhI+3jwUsly5nDyKTVNf0ECqv45Pt7Dk8JI=";
};
postPatch = ''

18
pkgs/top-level/all-packages.nix
View File

@ -16256,14 +16256,20 @@ with pkgs;
autoadb = callPackage ../misc/autoadb { };
ansible = ansible_2_12;
ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.12.6";
ansible = ansible_2_14;
ansible_2_14 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.13.6";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-XzZuhRFZ2Pcs5o0yuMDt2lbuU3wB6faOyjgr0VEK9l0=";
sha256 = "";
hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8=";
};
}));
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.12.10";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY=";
};
meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
}));