mirror of
https://gitlab.com/TECHNOFAB/nixible.git
synced 2026-02-02 11:25:08 +01:00
chore(lib): update ansible-core
This commit is contained in:
parent
76c6d39100
commit
4e6694ca64
1 changed files with 13 additions and 12 deletions
|
|
@ -26,32 +26,27 @@
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ansible-core";
|
pname = "ansible-core";
|
||||||
version = "2.18.6";
|
version = "2.19.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "ansible_core";
|
pname = "ansible_core";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-JbsgzhUWobcweDGyY872hAQ7NyBxFGa9nUFk5f1XZVc=";
|
hash = "sha256-h/y7xJLtFutq2wN5uuCtv2nzzoioRA5+iODc76n4pUw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# ansible_connection is already wrapped, so don't pass it through
|
# ansible_connection is already wrapped, so don't pass it through
|
||||||
# the python interpreter again, as it would break execution of
|
# the python interpreter again, as it would break execution of
|
||||||
# connection plugins.
|
# connection plugins.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace lib/ansible/executor/task_executor.py \
|
|
||||||
--replace "[python," "["
|
|
||||||
|
|
||||||
patchShebangs --build packaging/cli-doc/build.py
|
patchShebangs --build packaging/cli-doc/build.py
|
||||||
|
|
||||||
SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"'
|
SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"'
|
||||||
PYPROJECT=$(cat pyproject.toml)
|
WHEEL_PATTERN='"wheel[0-9 <>=.,]+"'
|
||||||
if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then
|
echo "Patching pyproject.toml"
|
||||||
echo "setuptools replace: ''${BASH_REMATCH[0]}"
|
# print replaced patterns to stdout
|
||||||
echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml
|
sed -r -i -e 's/'"$SETUPTOOLS_PATTERN"'/"setuptools"/w /dev/stdout' \
|
||||||
else
|
-e 's/'"$WHEEL_PATTERN"'/"wheel"/w /dev/stdout' pyproject.toml
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -86,6 +81,12 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
pythonRelaxDeps = ["resolvelib"];
|
pythonRelaxDeps = ["resolvelib"];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
export HOME="$(mktemp -d)"
|
||||||
|
packaging/cli-doc/build.py man --output-dir=man
|
||||||
|
installManPage man/*
|
||||||
|
'';
|
||||||
|
|
||||||
# internal import errors, missing dependencies
|
# internal import errors, missing dependencies
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue