public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.Shapely: 1.7.0 -> 1.7.1

Browse Source
This commit is contained in:
Nicolai Kellerer 2020-10-22 19:14:01 +02:00 committed by Frederik Rietdijk
parent b7fdb27f73
commit ef92fe9c43
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/shapely/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Shapely"; pname = "Shapely";
version = "1.7.0"; version = "1.7.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2"; sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/development/python-modules/shapely/library-paths.patch
View File

@ -2,7 +2,7 @@ diff --git a/shapely/geos.py b/shapely/geos.py
index d5a67d2..19b7ffc 100644 index d5a67d2..19b7ffc 100644
--- a/shapely/geos.py --- a/shapely/geos.py
+++ b/shapely/geos.py +++ b/shapely/geos.py
@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): @@ -61,127 +61,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
"Could not find lib {} or load any of its variants {}.".format( "Could not find lib {} or load any of its variants {}.".format(
libname, fallbacks or [])) libname, fallbacks or []))
@ -80,7 +80,11 @@ index d5a67d2..19b7ffc 100644
- ] - ]
- _lgeos = load_dll('geos_c', fallbacks=alt_paths) - _lgeos = load_dll('geos_c', fallbacks=alt_paths)
- -
- free = load_dll('c').free - # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
- # manpage says, "If filename is NULL, then the returned handle is for the
- # main program". This way we can let the linker do the work to figure out
- # which libc Python is actually using.
- free = CDLL(None).free
- free.argtypes = [c_void_p] - free.argtypes = [c_void_p]
- free.restype = None - free.restype = None
- -
@ -112,7 +116,7 @@ index d5a67d2..19b7ffc 100644
- except WindowsError: - except WindowsError:
- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 - # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
- pass - pass
-
-elif sys.platform == 'sunos5': -elif sys.platform == 'sunos5':
- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
- free = CDLL('libc.so.1').free - free = CDLL('libc.so.1').free