Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 473046636660
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ee01252681c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2019

  1. python.pkgs.shapely: fix tests on Darwin (#57630)

    @dotlambda
    dotlambda authored Mar 14, 2019
    Copy the full SHA
    5ee0125 View commit details
Showing with 18 additions and 0 deletions.
  1. +18 −0 pkgs/development/python-modules/shapely/library-paths.patch
18 changes: 18 additions & 0 deletions pkgs/development/python-modules/shapely/library-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -107,3 +107,21 @@ index 09bf1ab..837aa98 100644


def _geos_version():
diff --git a/tests/test_dlls.py b/tests/test_dlls.py
index 35f9cc2..3dfcaac 100644
--- a/tests/test_dlls.py
+++ b/tests/test_dlls.py
@@ -12,12 +12,7 @@ class LoadingTestCase(unittest.TestCase):
@unittest.skipIf(sys.platform == "win32", "FIXME: adapt test for win32")
def test_fallbacks(self):
load_dll('geos_c', fallbacks=[
- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), # anaconda (Mac OS X)
- '/opt/local/lib/libgeos_c.dylib', # MacPorts
- '/usr/local/lib/libgeos_c.dylib', # homebrew (Mac OS X)
- os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux)
- 'libgeos_c.so.1',
- 'libgeos_c.so'])
+ '@libgeos_c@'])


def test_suite():