From a320ab014d60f5401f409eb37ccb16aa23c32cf1 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 8 Oct 2020 20:20:12 +0200 Subject: [PATCH] gnu: python-shapely: Update to 1.7.1. * gnu/packages/python-xyz.scm (python-shapely): Update to 1.7.1. --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 459526941b..fa4a4f4954 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -507,14 +507,14 @@ pidof, tty, taskset, pmap.") (define-public python-shapely (package (name "python-shapely") - (version "1.6.4.post2") + (version "1.7.1") (source (origin (method url-fetch) (uri (pypi-uri "Shapely" version)) (sha256 (base32 - "03r42fmd9alp6r3q95ad6rldq2f7n1wimrw53zy5kpn33yv7pf64")))) + "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) @@ -533,11 +533,14 @@ pidof, tty, taskset, pmap.") (let ((geos (assoc-ref inputs "geos")) (glibc (assoc-ref inputs ,(if (%current-target-system) "cross-libc" "libc")))) - (substitute* "shapely/geos.py" + (substitute* '("shapely/geos.py" "shapely/_buildcfg.py") (("_lgeos = load_dll\\('geos_c', fallbacks=.*\\)") (string-append "_lgeos = load_dll('geos_c', fallbacks=['" geos "/lib/libgeos_c.so'])")) (("free = load_dll\\('c'\\)\\.free") + (string-append "free = load_dll('c', fallbacks=['" + glibc "/lib/libc.so.6']).free")) + (("free = load_dll\\('c', fallbacks=.*\\)\\.free") (string-append "free = load_dll('c', fallbacks=['" glibc "/lib/libc.so.6']).free")))) #t))))) -- 2.28.0