Unverified Commit 9ec180ee authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #232117 from mweinelt/ansible-updates

Ansible updates
parents efb55108 04821cd0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@

buildPythonPackage rec {
  pname = "ansible-core";
  version = "2.14.2";
  version = "2.15.0";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-R/DUtBJbWO26ZDWkfzfL5qGNpUWU0Y+BKVi7DLWNTmU=";
    hash = "sha256-z2kP1Ou0BZDgDFrNwGJHWMpMWNHksrAuwCagNAcOv00=";
  };

  # ansible_connection is already wrapped, so don't pass it through
+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ mapAliases ({
  amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11
  amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
  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_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
  ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
  ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
+8 −9
Original line number Diff line number Diff line
@@ -17495,22 +17495,21 @@ with pkgs;
  autoadb = callPackage ../misc/autoadb { };
  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";
  ansible = ansible_2_15;
  ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core;
  ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
    version = "2.14.5";
    src = oldAttrs.src.override {
      inherit version;
      hash = "sha256-Mf4yK2MpBnSo9zhhEN9QHwBEqkSJC+OrMTpuIluaKc8=";
      hash = "sha256-jE7tds5Fi0o3M0oIAt8pSI7Pn4rzjDERBpyWsXsgVTA=";
    };
  }));
  ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
    version = "2.12.10";
  ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
    version = "2.13.9";
    src = oldAttrs.src.override {
      inherit version;
      hash = "sha256-/rHfYXOM/B9eiTtCouwafeMpd9Z+hnB7Retj0MXDwjY=";
      hash = "sha256-nDGeygqcU83m8XSBLd1xFO2x5dDrXh30e9DY/v7ax2w=";
    };
    meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
  }));
  ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };