diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 42b60a1b59f3..0061a8e4144f 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -5,6 +5,7 @@ pythonOlder, installShellFiles, docutils, + setuptools, ansible, cryptography, importlib-resources, @@ -30,12 +31,13 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.17.5"; + version = "2.17.6"; + pyproject = true; src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-rn9R/RPcnVfJvNQ+8j+cJVyo8Y9LXAARpPm3JNksWo4="; + hash = "sha256-PlOXC3zr/irbObcRweL4u/y+2sgo2lHcA1ehkHBjjpU="; }; # ansible_connection is already wrapped, so don't pass it through @@ -53,7 +55,9 @@ buildPythonPackage rec { docutils ]; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ # depend on ansible instead of the other way around ansible diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 66d435657324..5d7dc5f17537 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases { alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17 angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 + ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08 antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6a847b642dd..1d60b1236939 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7845,14 +7845,6 @@ with pkgs; hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o="; }; })); - ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.15.9"; - src = oldAttrs.src.override { - inherit version; - pname = "ansible-core"; - hash = "sha256-JfmxtaWvPAmGvTko7QhurduGdSf7XIOv7xoDz60080U="; - }; - })); ansible-builder = with python3Packages; toPythonApplication ansible-builder;