commit 55e8c6faaf9ac2234768cc82d0e4e0973bfc1f92
parent 4077d413458737abff2ebb4833cf67973700bb1b
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 5 Feb 2023 21:40:19 +0300
Up
Diffstat:
11 files changed, 115 insertions(+), 21 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -175,6 +175,7 @@ lib.makeScope newScope (
arcgis2geojson = callPackage ./geospatial/arcgis2geojson { };
c2cwsgiutils = callPackage ./geospatial/c2cwsgiutils { };
cogeo-mosaic = callPackage ./geospatial/cogeo-mosaic { };
+ color-operations = callPackage ./geospatial/color-operations { };
datamaps = callPackage ./geospatial/datamaps { };
deegree = callPackage ./geospatial/deegree { };
elevation = callPackage ./geospatial/elevation {
@@ -208,6 +209,7 @@ lib.makeScope newScope (
rio-color = callPackage ./geospatial/rio-color { };
rio-mbtiles = callPackage ./geospatial/rio-mbtiles { };
rio-mucho = callPackage ./geospatial/rio-mucho { };
+ rio-stac = callPackage ./geospatial/rio-stac { };
rio-tiler = callPackage ./geospatial/rio-tiler { };
sasplanet-bin = callPackage ./geospatial/sasplanet/bin.nix { };
scooby = callPackage ./geospatial/scooby { };
diff --git a/pkgs/geospatial/cogeo-mosaic/default.nix b/pkgs/geospatial/cogeo-mosaic/default.nix
@@ -2,19 +2,22 @@
python3Packages.buildPythonPackage rec {
pname = "cogeo-mosaic";
- version = "4.1.0";
+ version = "5.1.0";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "developmentseed";
repo = "cogeo-mosaic";
rev = version;
- hash = "sha256-6pUuCEa2O0MT5UsOjnAeF1bLlnSpmuBMoZl5s8WJZoE=";
+ hash = "sha256-jwl0URSt77nk3IMdMMCWGF0U+giRA/8fSs0nNVmu9Dk=";
};
+ nativeBuildInputs = with python3Packages; [ hatchling hatch-fancy-pypi-readme ];
+
propagatedBuildInputs = with python3Packages; [
httpx
morecantile
- pygeos
+ shapely
cachetools
supermercado
rio-tiler
@@ -24,6 +27,7 @@ python3Packages.buildPythonPackage rec {
disabledTests = [
"test_mosaic_crud_error" # requires network access
+ "test_abs_backend"
];
meta = with lib; {
diff --git a/pkgs/geospatial/color-operations/default.nix b/pkgs/geospatial/color-operations/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "color-operations";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "vincentsarago";
+ repo = "color-operations";
+ rev = version;
+ hash = "sha256-xGugXOpCqI8+06faCf3AjjpJaOkblkGoyaDG3AyrZoI=";
+ };
+
+ nativeBuildInputs = with python3Packages; [ numpy ];
+
+ pythonImportsCheck = [ "color_operations" ];
+
+ meta = with lib; {
+ description = "Apply basic color-oriented image operations. Fork of rio-color";
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ maintainers = [ maintainers.sikmir ];
+ };
+}
diff --git a/pkgs/geospatial/geojson-pydantic/default.nix b/pkgs/geospatial/geojson-pydantic/default.nix
@@ -2,17 +2,20 @@
python3Packages.buildPythonPackage rec {
pname = "geojson-pydantic";
- version = "0.3.4";
+ version = "0.5.0";
+ format = "flit";
src = fetchFromGitHub {
owner = "developmentseed";
repo = "geojson-pydantic";
rev = version;
- hash = "sha256-WTsusDLTmZUAX5BpXHpKPe19nmort45Mx6D1wVYKaGw=";
+ hash = "sha256-ZAd4qLwQeAdOcwZ316Q/8VrsemuttzBlc0Qbwd6Nywo=";
};
+ nativeBuildInputs = with python3Packages; [ flit-core ];
+
propagatedBuildInputs = with python3Packages; [
- pydantic
+ pydantic shapely
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/geospatial/rio-cogeo/default.nix b/pkgs/geospatial/rio-cogeo/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonPackage rec {
pname = "rio-cogeo";
- version = "3.2.0";
+ version = "3.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "cogeotiff";
repo = "rio-cogeo";
rev = version;
- hash = "sha256-Xv3HgQP0PQZeu59LYCt3BuAUPPzKvdHndiemoSIcUec=";
+ hash = "sha256-lvGog5Pzbc7v49lZMxomwDszJN/CVzu+AAkb5in3IoY=";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/geospatial/rio-stac/default.nix b/pkgs/geospatial/rio-stac/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub, python3Packages, pystac }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "rio-stac";
+ version = "0.6.1";
+ format = "flit";
+
+ src = fetchFromGitHub {
+ owner = "developmentseed";
+ repo = "rio-stac";
+ rev = version;
+ hash = "sha256-1xIXI2fLuJmDuhLn3AZRCm+TeAmAhBsD+B4PkX07e4M=";
+ };
+
+ nativeBuildInputs = with python3Packages; [ flit-core ];
+
+ propagatedBuildInputs = with python3Packages; [
+ rasterio
+ pystac
+ ];
+
+ nativeCheckInputs = with python3Packages; [ pytestCheckHook jsonschema ];
+
+ disabledTests = [
+ "test_create_item"
+ ];
+
+ meta = with lib; {
+ description = "Create STAC item from raster datasets";
+ homepage = "https://developmentseed.org/rio-stac/";
+ license = licenses.mit;
+ maintainers = [ maintainers.sikmir ];
+ };
+}
diff --git a/pkgs/geospatial/rio-tiler/default.nix b/pkgs/geospatial/rio-tiler/default.nix
@@ -1,16 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, morecantile, pystac, rio-color }:
+{ lib, stdenv, fetchFromGitHub, python3Packages, morecantile, pystac, color-operations }:
python3Packages.buildPythonPackage rec {
pname = "rio-tiler";
- version = "3.1.2";
+ version = "4.1.6";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "cogeotiff";
repo = "rio-tiler";
rev = version;
- hash = "sha256-ecY3U4VB0TkYHeUy+HGOFin+LTNsbWi87+6AIOKGW7o=";
+ hash = "sha256-UeAsQ82Lg5aksUdGvcrw/gcTmCJhWnCQkbrcbmqYNgc=";
};
+ nativeBuildInputs = with python3Packages; [ hatchling ];
+
propagatedBuildInputs = with python3Packages; [
boto3
numexpr
@@ -18,8 +21,8 @@ python3Packages.buildPythonPackage rec {
pystac
rasterio
httpx
- rio-color
cachetools
+ color-operations
];
doCheck = false;
diff --git a/pkgs/geospatial/starlette-cramjam/default.nix b/pkgs/geospatial/starlette-cramjam/default.nix
@@ -2,15 +2,18 @@
python3Packages.buildPythonPackage rec {
pname = "starlette-cramjam";
- version = "0.1.0";
+ version = "0.3.2";
+ format = "flit";
src = fetchFromGitHub {
owner = "developmentseed";
repo = "starlette-cramjam";
rev = version;
- hash = "sha256-aCZnXsCkzq278aAj4QNz2gSIVWGn1IsL2QG9TAaNWg0=";
+ hash = "sha256-InxnMpyYg0m92oJfn7YbHECTQE9WMB9MwpoN3slxK7M=";
};
+ nativeBuildInputs = with python3Packages; [ flit-core ];
+
propagatedBuildInputs = with python3Packages; [
starlette
cramjam
diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, python3Packages
-, rio-tiler, geojson-pydantic, rio-cogeo, starlette-cramjam, cogeo-mosaic }:
+, rio-stac, rio-tiler, geojson-pydantic, rio-cogeo, starlette-cramjam, cogeo-mosaic }:
let
pname = "titiler";
- version = "0.6.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "developmentseed";
repo = "titiler";
rev = version;
- hash = "sha256-BfN/d2FEFTIuiOHxKltn1SHUdOzDrAkbJcEQANY6UtA=";
+ hash = "sha256-AdG2fZTvmgnTccLtHj4C3SzdqJ10icr3q3SNmRCtq0E=";
};
meta = with lib; {
@@ -27,10 +27,25 @@ let
fastapi
rio-tiler
geojson-pydantic
+ simplejson
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
};
+ titiler-extensions = python3Packages.buildPythonPackage {
+ inherit version src meta;
+ pname = "${pname}.extensions";
+ sourceRoot = "${src.name}/src/titiler/extensions";
+
+ propagatedBuildInputs = with python3Packages; [
+ rio-cogeo
+ rio-stac
+ titiler-core
+ ];
+ nativeCheckInputs = with python3Packages; [ pytestCheckHook jsonschema ];
+ disabledTests = [ "test_stacExtension" ];
+ };
+
titiler-mosaic = python3Packages.buildPythonPackage {
inherit version src meta;
pname = "${pname}.mosaic";
@@ -52,6 +67,7 @@ python3Packages.buildPythonPackage {
rio-cogeo
starlette-cramjam
titiler-core
+ titiler-extensions
titiler-mosaic
];
diff --git a/pkgs/gpx/gpxeditor/default.nix b/pkgs/gpx/gpxeditor/default.nix
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxeditor";
- version = "1.7.15";
+ version = "1.8.0";
src = fetchurl {
- url = "mirror://sourceforge/gpxeditor/GPX%20Editor/Version%20${finalAttrs.version}/GPX_Editor_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}.zip";
- hash = "sha256-laGJU8LHNNoUoVyHY2IaCXGpFmgOLSrWe/lCz5Tzjj4=";
+ url = "mirror://sourceforge/gpxeditor/GPX%20Editor/GPX%20Editor%20${finalAttrs.version}.zip";
+ hash = "sha256-KgVwx79kOQzXJQaQK1VRWHJHIU4yBpCH/7pFh7G4D54=";
};
dontUnpack = true;
diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix
@@ -17,7 +17,12 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-iL3mFxX32OaD8UdPdvMyc/ksmeCH4iykM37DgHd+KwE=";
};
- propagatedBuildInputs = with python3Packages; [ python-Levenshtein setuptools wikitextprocessor nltk ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace python-Levenshtein Levenshtein
+ '';
+
+ propagatedBuildInputs = with python3Packages; [ levenshtein setuptools wikitextprocessor nltk ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook unzip ];
