python3Packages.geoarrow-pyarrow: cleanup, fix

pkgs/development/python-modules/geoarrow-pyarrow/default.nix

@@ -2,33 +2,62 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
   geoarrow-c,
+  geoarrow-types,
   pyarrow,
   pyarrow-hotfix,
+
+  # tests
+  geopandas,
   numpy,
   pandas,
-  geoarrow-types,
-  geopandas,
   pyogrio,
   pyproj,
-  setuptools-scm,
+  pytestCheckHook,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "geoarrow-pyarrow";
   version = "0.3.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     repo = "geoarrow-python";
     owner = "geoarrow";
-    tag = "geoarrow-types-${version}";
+    tag = "geoarrow-types-${finalAttrs.version}";
     hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE=";
   };
 
-  sourceRoot = "${src.name}/geoarrow-pyarrow";
+  sourceRoot = "${finalAttrs.src.name}/geoarrow-pyarrow";
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    geoarrow-c
+    geoarrow-types
+    pyarrow
+    pyarrow-hotfix
+  ];
+
+  pythonImportsCheck = [ "geoarrow.pyarrow" ];
+
+  nativeCheckInputs = [
+    geopandas
+    numpy
+    pandas
+    pyogrio
+    pyproj
+    pytestCheckHook
+  ];
 
   disabledTests = [
     # these tests are incompatible with arrow 17
@@ -45,27 +74,6 @@ buildPythonPackage rec {
     "test_geometry_type_basic"
   ];
 
-  dependencies = [
-    geoarrow-c
-    pyarrow
-    pyarrow-hotfix
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-
-  checkInputs = [
-    geoarrow-types
-    numpy
-    pandas
-    geopandas
-    pyogrio
-    pyproj
-  ];
-
-  pythonImportsCheck = [ "geoarrow.pyarrow" ];
-
   meta = {
     description = "PyArrow implementation of geospatial data types";
     homepage = "https://github.com/geoarrow/geoarrow-python";
@@ -75,4 +83,4 @@ buildPythonPackage rec {
     ];
     teams = [ lib.teams.geospatial ];
   };
-}
+})