From dc2e45e3e580bc2a0fb69a80fdd2207eb1b8ba1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 13 Sep 2020 08:56:44 +0200 Subject: [PATCH] python.pkgs.geopandas: 0.8.0 -> 0.8.1 This fixes the geopandas build, which did break with the update of pandas from 1.0.5 to 1.1.0. --- .../python-modules/geopandas/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 07982b1e42b..200dfffa562 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,19 +1,27 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , pandas, shapely, fiona, descartes, pyproj -, pytest, Rtree }: +, pytest, Rtree, fetchpatch }: buildPythonPackage rec { pname = "geopandas"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "033jygbyycl9s6b0kqix9xynhapc2xd8nh47kcfacn514gyncgah"; + sha256 = "0618p0s0biisxk2s0h43hkc3bs1nwjk84rxbfyd6brfvs9yx4vq7"; }; + patches = [ + # Fix for test test_numerical_operations: https://github.com/geopandas/geopandas/issues/1541 + (fetchpatch { + url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch"; + sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq"; + }) + ]; + checkInputs = [ pytest Rtree ]; checkPhase = ''