Unverified Commit 8b070b25 authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

Merge pull request #224135 from kirillrdy/cartopy 

python3Packages.cartopy: fix failing tests with proj 9.2
parents d844391b 0bafd61d

pkgs/development/python-modules/cartopy/default.nix

+14 −0
Original line number Diff line number Diff line
@@ -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