1 files changed, 46 insertions, 41 deletions
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 35c9b57ce555..eabd53ac5555 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,68 +1,75 @@
-{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchFromGitHub
-, cython
-, gdal
-, oldest-supported-numpy
-, setuptools
-, wheel
-, attrs
-, certifi
-, click
-, click-plugins
-, cligj
-, munch
-, shapely
-, boto3
-, pytestCheckHook
-, pytz
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  gdal,
+  setuptools,
+
+  # dependencies
+  attrs,
+  certifi,
+  click,
+  click-plugins,
+  cligj,
+
+  # optional-dependencies
+  pyparsing,
+  shapely,
+  boto3,
+
+  # tests
+  fsspec,
+  pytestCheckHook,
+  pytz,
+  snuggs,
 }:
 
 buildPythonPackage rec {
   pname = "fiona";
-  version = "1.9.6";
+  version = "1.10.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Toblerity";
     repo = "Fiona";
     rev = "refs/tags/${version}";
-    hash = "sha256-MboM3IwGF8cuz+jMQ3QVZFAHjpspQ6kVJincq7OEkCM=";
+    hash = "sha256-5NN6PBh+6HS9OCc9eC2TcBvkcwtI4DV8qXnz4tlaMXc=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     gdal # for gdal-config
-    oldest-supported-numpy
     setuptools
-    wheel
   ];
 
-  buildInputs = [
-    gdal
-  ];
+  buildInputs = [ gdal ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     certifi
     click
-    cligj
     click-plugins
-    munch
+    cligj
   ];
 
-  passthru.optional-dependencies = {
-    calc = [ shapely ];
+  optional-dependencies = {
+    calc = [
+      pyparsing
+      shapely
+    ];
     s3 = [ boto3 ];
   };
 
   nativeCheckInputs = [
+    fsspec
     pytestCheckHook
     pytz
-  ] ++ passthru.optional-dependencies.s3;
+    shapely
+    snuggs
+  ] ++ optional-dependencies.s3;
 
   preCheck = ''
     rm -r fiona # prevent importing local fiona
@@ -84,18 +91,16 @@ buildPythonPackage rec {
     "test_append_memoryfile_drivers"
   ];
 
-  pythonImportsCheck = [
-    "fiona"
-  ];
+  pythonImportsCheck = [ "fiona" ];
 
   doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt";
     description = "OGR's neat, nimble, no-nonsense API for Python";
     mainProgram = "fio";
     homepage = "https://fiona.readthedocs.io/";
-    license = licenses.bsd3;
-    maintainers = teams.geospatial.members;
+    license = lib.licenses.bsd3;
+    maintainers = lib.teams.geospatial.members;
   };
 }