Merge pull request #286914 from dotlambda/mandown-fix

python311Packages.mandown: fix build

authored by Weijia Wang and committed by GitHub 28430903 a3ed4692

+20 -8
+11 -3
pkgs/development/python-modules/comicon/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , poetry-core 5 + , pythonRelaxDepsHook 5 6 , ebooklib 6 7 , lxml 7 8 , pillow ··· 10 11 11 12 buildPythonPackage rec { 12 13 pname = "comicon"; 13 - version = "1.0.0"; 14 - format = "pyproject"; 14 + version = "1.0.1"; 15 + pyproject = true; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "potatoeggy"; 18 19 repo = "comicon"; 19 20 rev = "v${version}"; 20 - hash = "sha256-D6nK+GlcG/XqMTH7h7mJcbZCRG2xDHRsnooSTtphDNs="; 21 + hash = "sha256-e9YEr8IwttMlj6FOxk+/kw79qiF1N8/e2qusfw3WH00="; 21 22 }; 22 23 23 24 nativeBuildInputs = [ 24 25 poetry-core 26 + pythonRelaxDepsHook 27 + ]; 28 + 29 + pythonRelaxDeps = [ 30 + "lxml" 31 + "pillow" 25 32 ]; 26 33 27 34 propagatedBuildInputs = [ ··· 34 41 pythonImportsCheck = [ "comicon" ]; 35 42 36 43 meta = with lib; { 44 + changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}"; 37 45 description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; 38 46 homepage = "https://github.com/potatoeggy/comicon"; 39 47 license = licenses.agpl3Only;
+9 -5
pkgs/development/python-modules/mandown/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , poetry-core 5 + , pythonRelaxDepsHook 5 6 , beautifulsoup4 6 7 , comicon 7 8 , feedparser ··· 18 19 buildPythonPackage rec { 19 20 pname = "mandown"; 20 21 version = "1.7.0"; 21 - format = "pyproject"; 22 + pyproject = true; 22 23 23 24 src = fetchFromGitHub { 24 25 owner = "potatoeggy"; ··· 29 30 30 31 nativeBuildInputs = [ 31 32 poetry-core 33 + pythonRelaxDepsHook 34 + ]; 35 + 36 + pythonRelaxDeps = [ 37 + "pillow" 38 + "typer" 32 39 ]; 33 40 34 41 propagatedBuildInputs = [ ··· 50 57 ]; 51 58 }; 52 59 53 - postPatch = '' 54 - substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"' 55 - ''; 56 - 57 60 pythonImportsCheck = [ "mandown" ]; 58 61 59 62 meta = with lib; { 63 + changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}"; 60 64 description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter"; 61 65 homepage = "https://github.com/potatoeggy/mandown"; 62 66 license = licenses.agpl3Only;