From 5281ae97c2b57a0a93d79394e70dc6643a70ded5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 12 May 2021 04:39:05 +0200 Subject: [PATCH] ansible: 2.9.12 -> 2.10.9 --- .../ansible/{default.nix => legacy.nix} | 0 pkgs/tools/admin/ansible/default.nix | 15 +-------------- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) rename pkgs/development/python-modules/ansible/{default.nix => legacy.nix} (100%) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/legacy.nix similarity index 100% rename from pkgs/development/python-modules/ansible/default.nix rename to pkgs/development/python-modules/ansible/legacy.nix diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 58b2852baca..7ed6d80bc1c 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -3,20 +3,7 @@ rec { ansible = ansible_2_10; - # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override - # for now. - ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.10.0"; - - # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; - }; - })); + ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed309e21931..3ecf4494ff4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -409,7 +409,7 @@ in { ansi2html = callPackage ../development/python-modules/ansi2html { }; - ansible = callPackage ../development/python-modules/ansible { }; + ansible = callPackage ../development/python-modules/ansible/legacy.nix { }; ansible-base = callPackage ../development/python-modules/ansible/base.nix { };