Unverified Commit f9909ca7 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

python312Packages.mandown: 1.10.1 -> 1.11.1 (#371362)

parents 63386f3f 479b592b

pkgs/by-name/co/comic-mandown/package.nix

+1 −3
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/comicon/default.nix

+18 −27
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch2,

  poetry-core,

  pythonOlder,

  ebooklib,

  fetchFromGitHub,

  lib,

  lxml,

  nix-update-script,

  pillow,

  poetry-core,

  pypdf,

  python-slugify,

  pythonOlder,

}:



buildPythonPackage rec {

  pname = "comicon";

  version = "1.3.0";

  version = "1.4.0";

  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -22,29 +22,14 @@ 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 = [

  build-system = [

    poetry-core

  ];



  pythonRelaxDeps = [

    "pillow"

    "pypdf"

  ];



  propagatedBuildInputs = [

  dependencies = [

    ebooklib

    lxml

    pillow
@@ -52,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 ];

  };

}

pkgs/development/python-modules/mandown/default.nix

+19 −18
Original line number Diff line number Diff line 
{

  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 {

  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 = [

  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 ];

  };

}