diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9717c09abe4b..37055b35e8f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13976,6 +13976,12 @@ githubId = 4587373; name = "Mitchell Nordine"; }; + mithicspirit = { + email = "rpc01234@gmail.com"; + github = "MithicSpirit"; + githubId = 24192522; + name = "MithicSpirit"; + }; mjanczyk = { email = "m@dragonvr.pl"; github = "mjanczyk"; diff --git a/pkgs/development/python-modules/autotrash/default.nix b/pkgs/by-name/au/autotrash/package.nix similarity index 54% rename from pkgs/development/python-modules/autotrash/default.nix rename to pkgs/by-name/au/autotrash/package.nix index 6c628b392535..c963703a9514 100644 --- a/pkgs/development/python-modules/autotrash/default.nix +++ b/pkgs/by-name/au/autotrash/package.nix @@ -1,12 +1,11 @@ { lib, - buildPythonPackage, + python3Packages, fetchFromGitHub, - poetry-core, - pytestCheckHook, + pandoc, + installShellFiles, }: - -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "autotrash"; version = "0.4.7"; pyproject = true; @@ -18,16 +17,26 @@ buildPythonPackage rec { hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo="; }; - build-system = [ poetry-core ]; + build-system = [ python3Packages.poetry-core ]; + + nativeBuildInputs = [ + installShellFiles + pandoc + ]; + postBuild = "make -C doc autotrash.1"; + postInstall = "installManPage doc/autotrash.1"; pythonImportsCheck = [ "autotrash" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = { description = "Tool to automatically purge old trashed files"; license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; - maintainers = with lib.maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ + sigmanificient + mithicspirit + ]; mainProgram = "autotrash"; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index dc89ee3215f0..39f52c3dd907 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07 asyncio-nats-client = nats-py; # added 2022-02-08 atsim_potentials = atsim-potentials; # added 2023-10-08 + inherit (super.pkgs) autotrash; # added 2024-09-23 awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13 Babel = babel; # added 2022-05-06 backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09fbd6fd81de..61ecfad662ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1048,8 +1048,6 @@ self: super: with self; { autoslot = callPackage ../development/python-modules/autoslot { }; - autotrash = callPackage ../development/python-modules/autotrash { }; - avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true;