From 479b592b84f157bc0ef4a3931d429497e70276d2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 15 Jan 2025 09:46:19 +0100
Subject: [PATCH] python312Packages.mandown: refactor

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/co/comic-mandown/package.nix     |  4 +--
 .../python-modules/mandown/default.nix        | 33 ++++++++++---------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix
index 04fc1bbab70f..24798c0a3f38 100644
--- a/pkgs/by-name/co/comic-mandown/package.nix
+++ b/pkgs/by-name/co/comic-mandown/package.nix
@@ -6,9 +6,7 @@
 }:
 let
   mandown' = python3Packages.mandown.overridePythonAttrs (prev: {
-    propagatedBuildInputs =
-      prev.propagatedBuildInputs
-      ++ lib.optionals withGUI prev.optional-dependencies.gui;
+    dependencies = prev.dependencies ++ lib.optionals withGUI prev.optional-dependencies.gui;
   });
   mandownApp = python3Packages.toPythonApplication mandown';
 in
diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix
index 175aee741c06..3738f5fb2588 100644
--- a/pkgs/development/python-modules/mandown/default.nix
+++ b/pkgs/development/python-modules/mandown/default.nix
@@ -1,20 +1,20 @@
 {
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  poetry-core,
   beautifulsoup4,
+  buildPythonPackage,
   comicon,
   feedparser,
+  fetchFromGitHub,
   filetype,
+  lib,
   lxml,
   natsort,
   nix-update-script,
   pillow,
+  poetry-core,
+  pyside6,
   python-slugify,
   requests,
   typer,
-  pyside6,
 }:
 
 buildPythonPackage rec {
@@ -29,16 +29,11 @@ buildPythonPackage rec {
     hash = "sha256-xoRUGtZMM1l3gCtF1wFHBo3vTEGJcNxqkO/yeTuEke8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
 
-  pythonRelaxDeps = [
-    "pillow"
-    "typer"
-  ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     beautifulsoup4
     comicon
     feedparser
@@ -51,18 +46,24 @@ buildPythonPackage rec {
     typer
   ];
 
+  pythonRelaxDeps = [
+    "pillow"
+    "typer"
+  ];
+
   optional-dependencies = {
     gui = [ pyside6 ];
-    updateScript = nix-update-script { };
   };
 
   pythonImportsCheck = [ "mandown" ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}";
     description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter";
     homepage = "https://github.com/potatoeggy/mandown";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ Scrumplex ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ Scrumplex ];
   };
 }