From b8a1ff8e2d8543f22d184308dffbae801e1fbadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Feb 2024 22:38:33 -0800 Subject: [PATCH 1/3] python311Packages.comicon: 1.0.0 -> 1.0.1 Diff: https://github.com/potatoeggy/comicon/compare/v1.0.0...v1.0.1 Changelog: https://github.com/potatoeggy/comicon/releases/tag/v1.0.1 --- .../development/python-modules/comicon/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index 8d69ae0fc744..04382d3ee340 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , ebooklib , lxml , pillow @@ -10,18 +11,24 @@ buildPythonPackage rec { pname = "comicon"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "comicon"; rev = "v${version}"; - hash = "sha256-D6nK+GlcG/XqMTH7h7mJcbZCRG2xDHRsnooSTtphDNs="; + hash = "sha256-e9YEr8IwttMlj6FOxk+/kw79qiF1N8/e2qusfw3WH00="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "lxml" + "pillow" ]; propagatedBuildInputs = [ @@ -34,6 +41,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "comicon" ]; meta = with lib; { + 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; From 25f8533f8852ffb4bcd0c13a68399f43bf82e115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Feb 2024 22:42:54 -0800 Subject: [PATCH 2/3] python311Packages.mandown: unpin pillow --- pkgs/development/python-modules/mandown/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 51d7db72259b..f5cfc39bc2cd 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pythonRelaxDepsHook , beautifulsoup4 , comicon , feedparser @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "mandown"; version = "1.7.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; @@ -29,6 +30,12 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pillow" + "typer" ]; propagatedBuildInputs = [ @@ -50,10 +57,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"' - ''; - pythonImportsCheck = [ "mandown" ]; meta = with lib; { From 41c5d38419e666d2cbf7b9b30c2cf724cca70ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Feb 2024 22:44:46 -0800 Subject: [PATCH 3/3] python311Packages.mandown: add meta.changelog --- pkgs/development/python-modules/mandown/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index f5cfc39bc2cd..eae43bc8d951 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mandown" ]; meta = with lib; { + 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;