Merge pull request #1716 from cpcloud/pyogrio

nix-community · Jun 26, 2024 · 0e52508 · 0e52508
2 parents bbc1ee7 + 2819215
commit 0e52508
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/overrides/default.nix b/overrides/default.nix
@@ -2462,7 +2462,9 @@ lib.composeManyExtensions [
       );
 
       pyogrio = prev.pyogrio.overridePythonAttrs (old: {
-        nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.versioneer gdal ];
+        nativeBuildInputs = old.nativeBuildInputs or [ ]
+          ++ [ final.versioneer gdal ]
+          ++ lib.optionals (final.pythonOlder "3.11") [ final.tomli ];
       });
 
       pyopencl = prev.pyopencl.overridePythonAttrs (

diff --git a/tests/pyogrio/default.nix b/tests/pyogrio/default.nix
@@ -1,7 +1,7 @@
-{ poetry2nix, python3, runCommand }:
+{ poetry2nix, python310, runCommand }:
 let
   mkEnv = preferWheel: poetry2nix.mkPoetryEnv {
-    python = python3;
+    python = python310;
     pyproject = ./pyproject.toml;
     poetrylock = ./poetry.lock;
     overrides = poetry2nix.overrides.withDefaults (