From 0bafd61d9d0e30ede4bfc3b02e9090fd4ace54b6 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 1 Apr 2023 08:36:37 +1100 Subject: [PATCH] python3Packages.cartopy: fix failing tests with proj 9.2 --- .../development/python-modules/cartopy/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 68e2eaaf2f23..4bb8eeb2c492 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , cython , setuptools-scm , geos @@ -34,6 +35,19 @@ buildPythonPackage rec { hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo="; }; + patches = [ + # https://github.com/SciTools/cartopy/pull/2163 + (fetchpatch { + url = "https://github.com/SciTools/cartopy/commit/7fb57e294914dbda0ebe8caaeac4deffe5e71639.patch"; + hash = "sha256-qc14q+v2IMC+1NQ+OqLjUfJA3Sr5txniqS7CTQ6c7LI="; + }) + # https://github.com/SciTools/cartopy/pull/2130 + (fetchpatch { + url = "https://github.com/SciTools/cartopy/commit/6b4572ba1a8a877f28e25dfe9559c14b7a565958.patch"; + hash = "sha256-0u6VJMrvoD9bRLHiQV4HQCKDyWEb9dDS2A3rjm6uqYw="; + }) + ]; + nativeBuildInputs = [ cython geos # for geos-config