From d944995ddaa922025f76e21e88d408595441ccb7 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Mon, 29 Sep 2025 16:08:13 +0200 Subject: [PATCH 1/4] python3Packages.geoarrow-c: 0.1.3 -> 0.3.1 --- .../python-modules/geoarrow-c/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-c/default.nix b/pkgs/development/python-modules/geoarrow-c/default.nix index c6832a88715a..ae46efd013bb 100644 --- a/pkgs/development/python-modules/geoarrow-c/default.nix +++ b/pkgs/development/python-modules/geoarrow-c/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { pname = "geoarrow-c"; - version = "0.1.3"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,17 +21,29 @@ buildPythonPackage rec { repo = "geoarrow-c"; owner = "geoarrow"; tag = "geoarrow-c-python-${version}"; - hash = "sha256-kQCD3Vptl7GtRFigr4darvdtwnaHRLZWvBBpZ0xHMgM="; + hash = "sha256-cSvFCIMHuwDh83DT3R3V86S+RjPzhqcnTaFXqKL43Ns="; }; sourceRoot = "${src.name}/python/geoarrow-c"; + preConfigure = '' + export CFLAGS="-I../../src/src/geoarrow" + ''; + build-system = [ cython setuptools setuptools-scm ]; + # upstream needs a bootstrap.py file to copy some source around to build the project. + # This file is executed by setup.py, so at build time, when sources are readonly! + # So we execute this file at patch time instead, and remove it to prevent setup.py to execute it again. + postPatch = '' + python ./bootstrap.py + rm -v ./bootstrap.py + ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeCheckInputs = [ From f2ca6f9b44725dac4fcf5225ffa6091c86cdee61 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 10 Oct 2025 11:18:16 +0200 Subject: [PATCH 2/4] python3Packages.geoarrow-types: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/geoarrow-types/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-types/default.nix b/pkgs/development/python-modules/geoarrow-types/default.nix index e0b2fdb36387..6b142da9cfba 100644 --- a/pkgs/development/python-modules/geoarrow-types/default.nix +++ b/pkgs/development/python-modules/geoarrow-types/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "geoarrow-types"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "geoarrow-python"; owner = "geoarrow"; tag = "geoarrow-types-${version}"; - hash = "sha256-LySb4AsRuSirDJ73MAPpnMwPM2WFfG6X82areR4Y4lI="; + hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE="; }; sourceRoot = "${src.name}/geoarrow-types"; @@ -29,6 +29,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ pyarrow ]; From fdfc7a33cff0883922a9fc32ad959268a32f3b89 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 10 Oct 2025 11:18:45 +0200 Subject: [PATCH 3/4] python3Packages.geoarrow-pyarrow: 0.1.2 -> 0.2.0 --- .../python-modules/geoarrow-pyarrow/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix index 371c6b2614e1..87ac659eeacb 100644 --- a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix +++ b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix @@ -9,6 +9,7 @@ pyarrow-hotfix, numpy, pandas, + geoarrow-types, geopandas, pyogrio, pyproj, @@ -16,7 +17,7 @@ }: buildPythonPackage rec { pname = "geoarrow-pyarrow"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { repo = "geoarrow-python"; owner = "geoarrow"; tag = "geoarrow-pyarrow-${version}"; - hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y="; + hash = "sha256-tgeWrVpGIyRqRGk1y9OdS/eYMJjt80sXHt6VCx8RWys="; }; sourceRoot = "${src.name}/geoarrow-pyarrow"; @@ -57,6 +58,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ + geoarrow-types numpy pandas geopandas From 364b6bbd9917d93d3736c193776c0e10f8a43768 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 10 Oct 2025 16:10:25 +0200 Subject: [PATCH 4/4] python3Packages.geoarrow-pandas: add a missing dependency and mark as broken --- pkgs/development/python-modules/geoarrow-pandas/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/geoarrow-pandas/default.nix b/pkgs/development/python-modules/geoarrow-pandas/default.nix index 3ade7c417748..13ce64540391 100644 --- a/pkgs/development/python-modules/geoarrow-pandas/default.nix +++ b/pkgs/development/python-modules/geoarrow-pandas/default.nix @@ -7,6 +7,7 @@ pandas, pyarrow, geoarrow-pyarrow, + geoarrow-types, setuptools-scm, }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { dependencies = [ geoarrow-pyarrow + geoarrow-types pandas pyarrow ]; @@ -49,5 +51,9 @@ buildPythonPackage rec { cpcloud ]; teams = [ lib.teams.geospatial ]; + # its removal upstream is in question + # https://github.com/geoarrow/geoarrow-python/issues/75 + # please unbreak it if the author decides to release a new version + broken = true; }; }