autotrash: move to pkgs/by-name and include manpage (NixOS#343855)

chriscoffee · Sep 29, 2024 · a35ae0a · a35ae0a
2 parents 4a1558c + 5da1088
commit a35ae0a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git 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/...ment/python-modules/autotrash/default.nix → pkgs/by-name/au/autotrash/package.nix b/...ment/python-modules/autotrash/default.nix → 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
@@ -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
@@ -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;