Merge branch 'master' into master

nix-community · Sep 3, 2024 · 1ea461e · 1ea461e
2 parents 0b0e6e3 + 7bd341a
commit 1ea461e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/overrides/default.nix b/overrides/default.nix
@@ -935,7 +935,7 @@ lib.composeManyExtensions [
 
       gdal = prev.gdal.overridePythonAttrs (
         old: {
-          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ gdal ];
+          nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ gdal final.numpy ];
           preBuild = (old.preBuild or "") + ''
             substituteInPlace setup.cfg \
               --replace "../../apps/gdal-config" '${gdal}/bin/gdal-config'
@@ -1647,6 +1647,11 @@ lib.composeManyExtensions [
         }
       );
 
+      msgspec = prev.msgspec.overridePythonAttrs (old: {
+        # crash during integer serialization - see https://github.com/jcrist/msgspec/issues/730
+        hardeningDisable = old.hardeningDisable or [] ++ [ "fortify" ];
+      });
+
       munch = prev.munch.overridePythonAttrs (
         old: {
           # Latest version of pypi imports pkg_resources at runtime, so setuptools is needed at runtime. :(

diff --git a/tests/gdal/poetry.lock b/tests/gdal/poetry.lock
diff --git a/tests/gdal/pyproject.toml b/tests/gdal/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["Your Name <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "~3.9"
-gdal = "*"
+gdal = "3.9.0"
 
 [tool.poetry.dev-dependencies]