From eeec6d732583f824d75901d97a2a734e7de7b3f0 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 31 Aug 2019 22:13:53 +0000 Subject: [PATCH 1/2] pybind11: 2.2.4 -> 2.3.0 pikepdf wants a newer pybind11. --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index f49c50185db7..1b89cb5ada7f 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1kz1z2cg3q901q9spkdhksmcfiskaghzmbb9ivr5mva856yvnak4"; + sha256 = "0923ngd2cvck3lhl7584y08n36pm6zqihfm1s69sbdc11xg936hr"; }; patches = [ From a1349065d6dbf86058233d94acbc1ac1a6b92da6 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 31 Aug 2019 22:14:44 +0000 Subject: [PATCH 2/2] python3Packages.pikepdf: 1.1.0 -> 1.6.2 pikepdf's tests work with the nixpkgs versions of pytest, attrs, and hypothesis. I skipped bumping these to avoid mass rebuilds. This fixes #67850. --- pkgs/development/python-modules/pikepdf/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c2662915b12d..025b17d19ae9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.1.0"; + version = "1.6.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + sha256 = "1x1b55znr0j4fib69l2h0xq0qmbf2nbxwbwd4f7y8r4sqi20239z"; }; buildInputs = [ @@ -55,8 +55,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml lxml ]; postPatch = '' - substituteInPlace requirements/test.txt \ - --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + sed -i \ + -e 's/^pytest .*/pytest/g' \ + -e 's/^attrs .*/attrs/g' \ + -e 's/^hypothesis .*/hypothesis/g' \ + requirements/test.txt ''; preBuild = '' @@ -70,4 +73,3 @@ buildPythonPackage rec { maintainers = [ maintainers.kiwi ]; }; } -