uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
48
pkgs/development/python-modules/pyproj/001.proj.patch
Normal file
48
pkgs/development/python-modules/pyproj/001.proj.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
diff --git a/pyproj/datadir.py b/pyproj/datadir.py
|
||||
index 9ca1d25..4198490 100644
|
||||
--- a/pyproj/datadir.py
|
||||
+++ b/pyproj/datadir.py
|
||||
@@ -70,7 +70,7 @@ def get_data_dir() -> str:
|
||||
global _VALIDATED_PROJ_DATA
|
||||
if _VALIDATED_PROJ_DATA is not None:
|
||||
return _VALIDATED_PROJ_DATA
|
||||
- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
|
||||
+ internal_datadir = Path("@proj@/share/proj")
|
||||
proj_lib_dirs = os.environ.get("PROJ_LIB", "")
|
||||
prefix_datadir = Path(sys.prefix, "share", "proj")
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 6bb0c6c..b3d0321 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -12,7 +12,7 @@ from setuptools import Extension, setup
|
||||
PROJ_MIN_VERSION = parse_version("7.2.0")
|
||||
CURRENT_FILE_PATH = Path(__file__).absolute().parent
|
||||
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
|
||||
-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
|
||||
+INTERNAL_PROJ_DIR = Path("@proj@")
|
||||
|
||||
|
||||
def get_proj_version(proj_dir: Path) -> str:
|
||||
@@ -155,7 +155,7 @@ def get_extension_modules():
|
||||
# By default we'll try to get options PROJ_DIR or the local version of proj
|
||||
proj_dir = get_proj_dir()
|
||||
library_dirs = get_proj_libdirs(proj_dir)
|
||||
- include_dirs = get_proj_incdirs(proj_dir)
|
||||
+ include_dirs = get_proj_incdirs(Path("@projdev@"))
|
||||
|
||||
proj_version = get_proj_version(proj_dir)
|
||||
check_proj_version(proj_version)
|
||||
diff --git a/test/test_cli.py b/test/test_cli.py
|
||||
index 7a696de..1b9b777 100644
|
||||
--- a/test/test_cli.py
|
||||
+++ b/test/test_cli.py
|
||||
@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson
|
||||
from test.conftest import grids_available, proj_env, tmp_chdir
|
||||
|
||||
PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(
|
||||
- "input_command", [["pyproj"], [sys.executable, "-m", "pyproj"]]
|
||||
+ "input_command", [[sys.executable, "-m", "pyproj"]]
|
||||
)
|
||||
|
||||
|
||||
94
pkgs/development/python-modules/pyproj/default.nix
Normal file
94
pkgs/development/python-modules/pyproj/default.nix
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
, proj
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
, cython
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, certifi
|
||||
, numpy
|
||||
, shapely
|
||||
, pandas
|
||||
, xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyproj";
|
||||
version = "3.3.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyproj4";
|
||||
repo = "pyproj";
|
||||
rev = version;
|
||||
hash = "sha256-crLYNACS9I0WGOdkYCJNoyxeAYsR41ZszzKRZsYHCLY=";
|
||||
};
|
||||
|
||||
# force pyproj to use ${proj}
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./001.proj.patch;
|
||||
proj = proj;
|
||||
projdev = proj.dev;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = [ proj ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
numpy
|
||||
shapely
|
||||
pandas
|
||||
xarray
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# We need to build extensions locally to run tests
|
||||
${python.interpreter} setup.py build_ext --inplace
|
||||
cd test
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
"test_doctest_wrapper.py"
|
||||
"test_datadir.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# The following tests try to access network and end up with a URLError
|
||||
"test__load_grid_geojson_old_file"
|
||||
"test_get_transform_grid_list"
|
||||
"test_get_transform_grid_list__area_of_use"
|
||||
"test_get_transform_grid_list__bbox__antimeridian"
|
||||
"test_get_transform_grid_list__bbox__out_of_bounds"
|
||||
"test_get_transform_grid_list__contains"
|
||||
"test_get_transform_grid_list__file"
|
||||
"test_get_transform_grid_list__source_id"
|
||||
"test_sync__area_of_use__list"
|
||||
"test_sync__bbox__list"
|
||||
"test_sync__bbox__list__exclude_world_coverage"
|
||||
"test_sync__download_grids"
|
||||
"test_sync__file__list"
|
||||
"test_sync__source_id__list"
|
||||
"test_sync_download"
|
||||
"test_sync_download__directory"
|
||||
"test_sync_download__system_directory"
|
||||
"test_transformer_group__download_grids"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python interface to PROJ.4 library";
|
||||
homepage = "https://github.com/pyproj4/pyproj";
|
||||
license = with lib.licenses; [ isc ];
|
||||
maintainers = with lib.maintainers; [ lsix ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue