about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/rasterio
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-12-01 19:00:09 +0100
committerAlyssa Ross <hi@alyssa.is>2023-12-01 19:00:09 +0100
commit9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch)
tree4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/python-modules/rasterio
parenta9cbfb6941b47d6f50129e6e36927882392daed7 (diff)
parent2344fe1da14cb08b0c18743b207995f9b8597915 (diff)
downloadnixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst
nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/rasterio')
-rw-r--r--nixpkgs/pkgs/development/python-modules/rasterio/default.nix32
1 files changed, 23 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
index e0f393ff6134..0e216ce18508 100644
--- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix
@@ -1,25 +1,27 @@
 { lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pytestCheckHook
+, pythonOlder
 , stdenv
+
 , affine
 , attrs
 , boto3
-, buildPythonPackage
+, certifi
 , click
 , click-plugins
 , cligj
-, certifi
 , cython_3
-, fetchFromGitHub
 , gdal
 , hypothesis
-, matplotlib
 , ipython
+, matplotlib
 , numpy
 , oldest-supported-numpy
 , packaging
 , pytest-randomly
-, pytestCheckHook
-, pythonOlder
 , setuptools
 , shapely
 , snuggs
@@ -40,6 +42,18 @@ buildPythonPackage rec {
     hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
   };
 
+  patches = [
+    # fix tests failing with GDAL 3.8.0
+    (fetchpatch {
+      url = "https://github.com/rasterio/rasterio/commit/54ec554a6d9ee52207ad17dee42cbc51c613f709.diff";
+      hash = "sha256-Vjt9HRYNAWyj0myMdtSUENbcLjACfzegEClzZb4BxY8=";
+    })
+    (fetchpatch {
+      url = "https://github.com/rasterio/rasterio/commit/5a72613c58d1482bf297d08cbacf27992f52b2c4.diff";
+      hash = "sha256-bV6rh3GBmeqq9+Jff2b8/1wOuyF3Iqducu2eN4CT3lM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cython_3
     gdal
@@ -52,13 +66,13 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     affine
     attrs
+    certifi
     click
     click-plugins
     cligj
-    certifi
     numpy
-    snuggs
     setuptools
+    snuggs
   ];
 
   passthru.optional-dependencies = {
@@ -77,8 +91,8 @@ buildPythonPackage rec {
     boto3
     hypothesis
     packaging
-    pytest-randomly
     pytestCheckHook
+    pytest-randomly
     shapely
   ];