Unverified Commit 010533ca authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

ansible_2_16: fix build, ansible_2_17: use correct version (#381523)

parents bb38273e 429299c5

pkgs/development/python-modules/ansible/core.nix

+8 −2
Original line number Diff line number Diff line
@@ -49,8 +49,14 @@ buildPythonPackage rec { 


    patchShebangs --build packaging/cli-doc/build.py



    substituteInPlace pyproject.toml \

      --replace-fail "setuptools >= 66.1.0, <= 75.6.0" setuptools

    SETUPTOOLS_PATTERN='"setuptools[0-9 <>=.,]+"'

    PYPROJECT=$(cat pyproject.toml)

    if [[ "$PYPROJECT" =~ $SETUPTOOLS_PATTERN ]]; then

      echo "setuptools replace: ''${BASH_REMATCH[0]}"

      echo "''${PYPROJECT//''${BASH_REMATCH[0]}/'"setuptools"'}" > pyproject.toml

    else

      exit 2

    fi

  '';



  nativeBuildInputs = [

pkgs/top-level/all-packages.nix

+9 −2
Original line number Diff line number Diff line
@@ -7455,8 +7455,15 @@ with pkgs; 














  anybadge = with python3Packages; toPythonApplication anybadge;



























  ansible = ansible_2_17;













  ansible_2_17 = python3Packages.toPythonApplication python3Packages.ansible-core;













  ansible = ansible_2_18;













  ansible_2_18 = python3Packages.toPythonApplication python3Packages.ansible-core;













  ansible_2_17 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {













    version = "2.17.8";













    src = oldAttrs.src.override {













      inherit version;













      hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc=";













    };













  }));















  ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {















    version = "2.16.8";















    src = oldAttrs.src.override {