-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0893452
commit bb5c6ba
Showing
10 changed files
with
141 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
{ | ||
liberaforms = import ./liberaforms.nix; | ||
# LiberaForms is intentionally disabled. | ||
# Refer to <https://github.com/ngi-nix/ngipkgs/issues/40>. | ||
#liberaforms = import ./liberaforms.nix; | ||
pretalx = import ./pretalx.nix; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# KiKit | ||
|
||
## Dependencies | ||
|
||
### Shapely | ||
|
||
KiKit depends on an outdated version of Shapely, see | ||
<https://github.com/yaqwsx/KiKit/issues/574>. | ||
|
||
The files in `/pkgs/kikit/shapely` were copied from [nixpkgs at revision `8d8e62e`](https://github.com/NixOS/nixpkgs/tree/8d8e62e74f511160a599471549a98bc9e4f4818d) and slightly adapted and reformatted. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
{ | ||
pkgs, | ||
lib, | ||
stdenv, | ||
fetchPypi, | ||
substituteAll, | ||
python3, | ||
}: | ||
python3.pkgs.buildPythonPackage rec { | ||
pname = "Shapely"; | ||
version = "1.8.4"; | ||
disabled = python3.pkgs.pythonOlder "3.6"; | ||
|
||
src = fetchPypi { | ||
inherit pname version; | ||
sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; | ||
}; | ||
|
||
nativeBuildInputs = with pkgs; [ | ||
pkgs.geos # for geos-config | ||
python3.pkgs.cython | ||
]; | ||
|
||
propagatedBuildInputs = with python3.pkgs; [ | ||
numpy | ||
]; | ||
|
||
checkInputs = with python3.pkgs; [ | ||
pytestCheckHook | ||
]; | ||
|
||
# Environment variable used in shapely/_buildcfg.py | ||
GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; | ||
|
||
patches = [ | ||
# Patch to search form GOES .so/.dylib files in a Nix-aware way | ||
(substituteAll { | ||
src = ./library-paths.patch; | ||
libgeos_c = GEOS_LIBRARY_PATH; | ||
libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; | ||
}) | ||
]; | ||
|
||
preCheck = '' | ||
rm -r shapely # prevent import of local shapely | ||
''; | ||
|
||
disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ | ||
# FIXME(lf-): these logging tests are broken, which is definitely our | ||
# fault. I've tried figuring out the cause and failed. | ||
# | ||
# It is apparently some sandbox or no-sandbox related thing on macOS only | ||
# though. | ||
"test_error_handler_exception" | ||
"test_error_handler" | ||
"test_info_handler" | ||
]; | ||
|
||
pythonImportsCheck = ["shapely"]; | ||
|
||
meta = with lib; { | ||
description = "Geometric objects, predicates, and operations"; | ||
homepage = "https://pypi.python.org/pypi/Shapely/"; | ||
license = with licenses; [bsd3]; | ||
maintainers = with maintainers; [knedlsepp]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git a/shapely/geos.py b/shapely/geos.py | ||
index 88c5f53..1ccd6e4 100644 | ||
--- a/shapely/geos.py | ||
+++ b/shapely/geos.py | ||
@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): | ||
alt_paths = [ | ||
'libgeos_c.so.1', | ||
'libgeos_c.so', | ||
+ '@libgeos_c@', | ||
] | ||
_lgeos = load_dll('geos_c', fallbacks=alt_paths) | ||
|
||
@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': | ||
"/usr/local/lib/libgeos_c.dylib", | ||
# homebrew Apple Silicon | ||
"/opt/homebrew/lib/libgeos_c.dylib", | ||
+ "@libgeos_c@", | ||
] | ||
_lgeos = load_dll('geos_c', fallbacks=alt_paths) | ||
|
||
diff --git a/tests/test_dlls.py b/tests/test_dlls.py | ||
index c71da8e..c36262c 100644 | ||
--- a/tests/test_dlls.py | ||
+++ b/tests/test_dlls.py | ||
@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): | ||
'/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) | ||
os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) | ||
'libgeos_c.so.1', | ||
- 'libgeos_c.so']) | ||
+ 'libgeos_c.so', | ||
+ '@libgeos_c@']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/pyproject.toml b/pyproject.toml | ||
index 8b31bb7..0e2d0e0 100644 | ||
--- a/pyproject.toml | ||
+++ b/pyproject.toml | ||
@@ -36,7 +36,7 @@ packages=[ | ||
python = ">=3.7" | ||
euclid3 = "^0.1.0" | ||
pypng = "^0.0.19" | ||
-PrettyTable = "=0.7.2" | ||
+PrettyTable = "*" | ||
ply = "^3.11" | ||
setuptools = ">=65.6.3" |