From c3d6a191472f22fd7d3a70d597867f231ba0a129 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 6 Jan 2025 08:49:26 +0100 Subject: [PATCH 1/4] python312Packages.comicon: 1.3.0 -> 1.4.0 Signed-off-by: Sefa Eyeoglu --- .../python-modules/comicon/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index d57701eb250d..23f09def1162 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, poetry-core, pythonOlder, ebooklib, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "comicon"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,26 +21,15 @@ buildPythonPackage rec { owner = "potatoeggy"; repo = "comicon"; tag = "v${version}"; - hash = "sha256-0AGCTnStyBVL7DVkrUFyD60xnuuO1dcl+Twdyy+uq1Y="; + hash = "sha256-jZ/ZhSFg0ZPTYI10s8Cn1s9UZRFFnuLjS96lnUFVekQ="; }; - patches = [ - # Upstream forgot to bump the version before tagging - # See https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e - (fetchpatch2 { - name = "comicon-version-bump.patch"; - url = "https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e.diff"; - hash = "sha256-ZHltw4OSYuHF8mH0kBZDsuozPy08Bm7nme+XSwfGNn8="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; pythonRelaxDeps = [ "pillow" - "pypdf" ]; propagatedBuildInputs = [ From c59e3ea1085b26cdc39a97a0bc624b618311458d Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 15 Jan 2025 09:47:57 +0100 Subject: [PATCH 2/4] python312Packages.comicon: refactor Signed-off-by: Sefa Eyeoglu --- .../python-modules/comicon/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index 23f09def1162..3f902b0128e9 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -1,14 +1,15 @@ { - lib, buildPythonPackage, - fetchFromGitHub, - poetry-core, - pythonOlder, ebooklib, + fetchFromGitHub, + lib, lxml, + nix-update-script, pillow, + poetry-core, pypdf, python-slugify, + pythonOlder, }: buildPythonPackage rec { @@ -24,15 +25,11 @@ buildPythonPackage rec { hash = "sha256-jZ/ZhSFg0ZPTYI10s8Cn1s9UZRFFnuLjS96lnUFVekQ="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "pillow" - ]; - - propagatedBuildInputs = [ + dependencies = [ ebooklib lxml pillow @@ -40,15 +37,21 @@ buildPythonPackage rec { python-slugify ]; + pythonRelaxDeps = [ + "pillow" + ]; + doCheck = false; # test artifacts are not public pythonImportsCheck = [ "comicon" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}"; description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; homepage = "https://github.com/potatoeggy/comicon"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Scrumplex ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ Scrumplex ]; }; } From 210b2262a96a03a7dfd2f9e74cd568047cafcaf8 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 6 Jan 2025 08:49:49 +0100 Subject: [PATCH 3/4] python312Packages.mandown: 1.10.1 -> 1.11.1 Signed-off-by: Sefa Eyeoglu --- pkgs/development/python-modules/mandown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index b45bec563437..175aee741c06 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.10.1"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; tag = "v${version}"; - hash = "sha256-6i0a2jEJy7aL6W801Xki7jmHhO5kkFL8rJI+y+MhWVo="; + hash = "sha256-xoRUGtZMM1l3gCtF1wFHBo3vTEGJcNxqkO/yeTuEke8="; }; nativeBuildInputs = [ From 479b592b84f157bc0ef4a3931d429497e70276d2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 15 Jan 2025 09:46:19 +0100 Subject: [PATCH 4/4] python312Packages.mandown: refactor Signed-off-by: Sefa Eyeoglu --- 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 ]; }; }