Merge pull request #67853 from ivan/pikepdf-fix-build

python3Packages.pikepdf: 1.1.0 -> 1.6.2, pybind11: 2.2.4 -> 2.3.0
This commit is contained in:
worldofpeace 2019-09-01 00:31:37 -04:00 committed by GitHub
commit 3104cb2867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions

View File

@ -22,12 +22,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pikepdf"; pname = "pikepdf";
version = "1.1.0"; version = "1.6.2";
disabled = ! isPy3k; disabled = ! isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z";
}; };
buildInputs = [ buildInputs = [
@ -55,8 +55,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ defusedxml lxml ]; propagatedBuildInputs = [ defusedxml lxml ];
postPatch = '' postPatch = ''
substituteInPlace requirements/test.txt \ sed -i \
--replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" -e 's/^pytest .*/pytest/g' \
-e 's/^attrs .*/attrs/g' \
-e 's/^hypothesis .*/hypothesis/g' \
requirements/test.txt
''; '';
preBuild = '' preBuild = ''
@ -70,4 +73,3 @@ buildPythonPackage rec {
maintainers = [ maintainers.kiwi ]; maintainers = [ maintainers.kiwi ];
}; };
} }

View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pybind11"; pname = "pybind11";
version = "2.2.4"; version = "2.3.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4"; sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr";
}; };
patches = [ patches = [