diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/shapely/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/shapely/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix index e8ea874e5ca5..818cce6a5670 100644 --- a/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -8,17 +8,16 @@ , pytestCheckHook , cython , numpy -, fetchpatch }: buildPythonPackage rec { pname = "Shapely"; - version = "1.7.1"; - disabled = pythonOlder "3.5"; + version = "1.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"; + sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; }; nativeBuildInputs = [ @@ -38,16 +37,6 @@ buildPythonPackage rec { GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; patches = [ - # Fix with geos 3.9. This patch will be part of the next release after 1.7.1 - (fetchpatch { - url = "https://github.com/Toblerity/Shapely/commit/77879a954d24d1596f986d16ba3eff5e13861164.patch"; - sha256 = "1w7ngjqbpf9vnvrfg4nyv34kckim9a60gvx20h6skc79xwihd4m5"; - excludes = [ - "tests/test_create_inconsistent_dimensionality.py" - "appveyor.yml" - ".travis.yml" - ]; - }) # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { src = ./library-paths.patch; |