Unverified Commit 28430903 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #286914 from dotlambda/mandown-fix

python311Packages.mandown: fix build
parents a3ed4692 41c5d384
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -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;
+9 −5
Original line number Diff line number Diff line
@@ -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,13 +57,10 @@ buildPythonPackage rec {
    ];
  };

  postPatch = ''
    substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"'
  '';

  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;