Merge pull request #128265 from ambroisie/update-calibre-web

This commit is contained in:
Sandro 2021-06-27 18:19:21 +02:00 committed by GitHub
commit 54fb6ba935
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 6 deletions

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, python
, tqdm
}:
buildPythonPackage rec {
pname = "pypdf3";
version = "1.0.5";
src = fetchPypi {
pname = "PyPDF3";
inherit version;
sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU=";
};
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
checkPhase = ''
${python.interpreter} -m unittest tests/*.py
'';
propagatedBuildInputs = [
tqdm
];
meta = with lib; {
description = "A Pure-Python library built as a PDF toolkit";
homepage = "https://github.com/sfneal/PyPDF3";
license = licenses.bsd3;
maintainers = with maintainers; [ ambroisie ];
};
}

View file

@ -7,22 +7,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.11";
version = "0.6.12";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "10sjllhhcamswpa1wlim4mbm2zl4g804bwly5p4nmklg7n1v226g";
sha256 = "sha256-IgS281qDxG302UznC63nZH8/ty4fgFtn+lLYdakGA4w=";
};
prePatch = ''
substituteInPlace setup.cfg \
--replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \
--replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \
--replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
--replace "Babel>=1.3, <2.9" "Babel>=1.3, <=2.9"
--replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0"
'';
patches = [
@ -54,7 +52,7 @@ python3.pkgs.buildPythonApplication rec {
flask_login
flask_principal
iso-639
pypdf2
pypdf3
requests
sqlalchemy
tornado

View file

@ -6309,6 +6309,8 @@ in {
pypdf2 = callPackage ../development/python-modules/pypdf2 { };
pypdf3 = callPackage ../development/python-modules/pypdf3 { };
pypeg2 = callPackage ../development/python-modules/pypeg2 { };
pyperclip = callPackage ../development/python-modules/pyperclip { };