nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 23:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #240818 from tjni/ansible-runner

Browse Source 
python310Packages.ansible-runner: 2.3.1 -> 2.3.3
This commit is contained in:
Sandro 2023-07-09 19:50:19 +02:00 committed by GitHub
commit 2b356dae62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,9 @@
, ansible-core
, buildPythonPackage
, fetchPypi
, fetchpatch
, glibcLocales
, importlib-metadata
, mock
, openssh
, pbr
@ -21,16 +23,25 @@
buildPythonPackage rec {
pname = "ansible-runner";
version = "2.3.1";
version = "2.3.3";
format = "setuptools";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-HS8C06Ylc/OOaKI3kBGLeYF5HCvtK18i96NqIhwoh1Y=";
hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs=";
};
patches = [
(fetchpatch {
name = "fix-tests.patch";
url = "https://github.com/ansible/ansible-runner/commit/0d522c90cfc1f305e118705a1b3335ccb9c1633d.patch";
hash = "sha256-eTnQkftvjK0YHU+ovotRVSuVlvaVeXp5SvYk1DPCg88=";
excludes = [ ".github/workflows/ci.yml" "tox.ini" ];
})
];
nativeBuildInputs = [
pbr
];
@ -42,6 +53,8 @@ buildPythonPackage rec {
python-daemon
pyyaml
six
] ++ lib.optionals (pythonOlder "3.10") [
importlib-metadata
];
nativeCheckInputs = [
@ -70,10 +83,6 @@ buildPythonPackage rec {
"test_large_stdout_blob"
# Failed: DID NOT RAISE <class 'RuntimeError'>
"test_validate_pattern"
] ++ lib.optionals stdenv.isDarwin [
# test_process_isolation_settings is currently broken on Darwin Catalina
# https://github.com/ansible/ansible-runner/issues/413
"process_isolation_settings"
];
disabledTestPaths = [

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

@ -1,9 +1,12 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, pythonRelaxDepsHook
, installShellFiles
, ansible
, cryptography
, importlib-resources
, jinja2
, junit-xml
, lxml
@ -41,6 +44,8 @@ buildPythonPackage rec {
nativeBuildInputs = [
installShellFiles
] ++ lib.optionals (pythonOlder "3.10") [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
@ -64,7 +69,15 @@ buildPythonPackage rec {
requests
scp
xmltodict
] ++ lib.optional windowsSupport pywinrm;
] ++ lib.optionals windowsSupport [
pywinrm
] ++ lib.optionals (pythonOlder "3.10") [
importlib-resources
];
pythonRelaxDeps = lib.optionals (pythonOlder "3.10") [
"importlib-resources"
];
postInstall = ''
installManPage docs/man/man1/*.1