From fab6fc35329b188c05d9b595ef4ae1895424ba5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 16 May 2023 09:48:23 +0200
Subject: [PATCH] ansible-later: Remove from python-modules

This is an application, not a library.
---
 .../admin/ansible/later.nix}                  | 31 +++----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 7 insertions(+), 29 deletions(-)
 rename pkgs/{development/python-modules/ansible-later/default.nix => tools/admin/ansible/later.nix} (77%)

diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/tools/admin/ansible/later.nix
similarity index 77%
rename from pkgs/development/python-modules/ansible-later/default.nix
rename to pkgs/tools/admin/ansible/later.nix
index cd30731a9890..9cc7ffb38eb5 100644
--- a/pkgs/development/python-modules/ansible-later/default.nix
+++ b/pkgs/tools/admin/ansible/later.nix
@@ -1,34 +1,13 @@
 { lib
-, ansible
-, ansible-core
-, anyconfig
-, appdirs
-, buildPythonPackage
-, colorama
 , fetchFromGitHub
-, flake8
-, jsonschema
-, nested-lookup
-, pathspec
-, poetry-core
-, pytest-mock
-, python-json-logger
-, pytestCheckHook
-, pythonRelaxDepsHook
-, pythonOlder
-, pyyaml
-, toolz
-, unidiff
-, yamllint
+, python3
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "ansible-later";
   version = "3.3.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = pname;
@@ -53,12 +32,12 @@ buildPythonPackage rec {
     "yamllint"
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     pythonRelaxDepsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     ansible
     ansible-core
     anyconfig
@@ -75,7 +54,7 @@ buildPythonPackage rec {
     yamllint
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytest-mock
     pytestCheckHook
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 236fa5e2472d..460e39d3fde4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17565,7 +17565,7 @@ with pkgs;
     zig = buildPackages.zig_0_10;
   };
 
-  ansible-later = with python3.pkgs; toPythonApplication ansible-later;
+  ansible-later = callPackage ../tools/admin/ansible/later.nix { };
 
   ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 7f981f9fd7d2..ddfc8c292077 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -37,6 +37,7 @@ mapAliases ({
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
   ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
+  ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16
   ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16
   anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   argon2_cffi = argon2-cffi; # added 2022-05-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 750e30da0078..d22fb5d840e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -496,8 +496,6 @@ self: super: with self; {
 
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
 
-  ansible-later = callPackage ../development/python-modules/ansible-later { };
-
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
   ansi = callPackage ../development/python-modules/ansi { };