Merge pull request #224135 from kirillrdy/cartopy
python3Packages.cartopy: fix failing tests with proj 9.2
This commit is contained in:
commit
8b070b25f3
1 changed files with 14 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, fetchpatch
|
||||||
, cython
|
, cython
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
, geos
|
, geos
|
||||||
|
@ -34,6 +35,19 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
cython
|
cython
|
||||||
geos # for geos-config
|
geos # for geos-config
|
||||||
|
|
Loading…
Reference in a new issue