BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #277719 from natsukium/ansible/update

Browse source 
ansible_2_16: init at 2.16.2; ansible_2_13: remove
This commit is contained in:
OTABI Tomoya 2024-01-15 17:31:04 +09:00 committed by GitHub
commit 817c314ea6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-core"; pname = "ansible-core";
version = "2.15.5"; version = "2.16.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; hash = "sha256-5KtVnn5SWxxvmQhPyoc7sBR3XV7L6EW3wHuOnWycBIs=";
}; };
# ansible_connection is already wrapped, so don't pass it through # ansible_connection is already wrapped, so don't pass it through

17
pkgs/development/python-modules/pytest-ansible/default.nix
View file

@ -1,29 +1,30 @@
{ lib { lib
, stdenv , stdenv
, ansible-compat
, ansible-core , ansible-core
, buildPythonPackage , buildPythonPackage
, coreutils , coreutils
, fetchFromGitHub , fetchFromGitHub
, packaging
, pytest , pytest
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools , setuptools
, setuptools-scm , setuptools-scm
, wheel
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-ansible"; pname = "pytest-ansible";
version = "4.1.1"; version = "24.1.1";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ansible"; owner = "ansible";
repo = "pytest-ansible"; repo = "pytest-ansible";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ="; hash = "sha256-UPQx+CGJgaK4XVNngtzzncSueQN9LWh1gMmH5nGtPNk=";
}; };
postPatch = '' postPatch = ''
@ -34,7 +35,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
setuptools setuptools
setuptools-scm setuptools-scm
wheel
]; ];
buildInputs = [ buildInputs = [
@ -43,6 +43,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
ansible-core ansible-core
ansible-compat
packaging
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
@ -77,6 +79,9 @@ buildPythonPackage rec {
# These tests fail in the Darwin sandbox # These tests fail in the Darwin sandbox
"tests/test_adhoc.py" "tests/test_adhoc.py"
"tests/test_adhoc_result.py" "tests/test_adhoc_result.py"
] ++ lib.optionals (lib.versionAtLeast ansible-core.version "2.16") [
# Test fail in the NixOS environment
"tests/test_adhoc.py"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [

1
pkgs/top-level/aliases.nix
View file

@ -70,6 +70,7 @@ mapAliases ({
amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31
angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
antimicroX = antimicrox; # Added 2021-10-31 antimicroX = antimicrox; # Added 2021-10-31
arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26

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

@ -18253,8 +18253,15 @@ with pkgs;
autoadb = callPackage ../misc/autoadb { }; autoadb = callPackage ../misc/autoadb { };
ansible = ansible_2_15; ansible = ansible_2_16;
ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core; ansible_2_16 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.15.5";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI=";
};
}));
ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.14.13"; version = "2.14.13";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -18262,13 +18269,6 @@ with pkgs;
hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o="; hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o=";
}; };
})); }));
ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.13.10";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-1LQKSq+GDe9sLJ6K1SAfhoPj59fY4hRjxtWepPixLfc=";
};
}));
ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { }; ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };