From cd5b40ab2b03b97a5d7e40a10fc411f83192f643 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 9 Nov 2024 08:34:23 -0600 Subject: [PATCH 1/6] gdal: 3.9.3 -> 3.10.0 --- pkgs/development/libraries/gdal/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b33641a3442a9..a38ddad30e1c7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -3,7 +3,6 @@ stdenv, callPackage, fetchFromGitHub, - fetchpatch, useMinimalFeatures ? false, useArmadillo ? (!useMinimalFeatures), @@ -82,27 +81,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-8LY63s5vOVK0V37jQ60qFsaW/2D/13Xuy9/2OPLyTso="; + hash = "sha256-pb2xKTmJB7U1jIG80ENmZrR7vFw6YDoees43u/JhU3Y="; }; - patches = [ - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; - sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; - }) - (fetchpatch { - name = "arrow-18.patch"; - url = "https://github.com/OSGeo/gdal/commit/9a8c5c031404bbc81445291bad128bc13766cafa.patch"; - sha256 = "sha256-tF46DmF7ZReqY8ACTTPXohWLsRn8lVxhKF1s+r254KM="; - }) - ]; - nativeBuildInputs = [ bison @@ -301,7 +288,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" - "test_ogr_gpkg_arrow_stream_huge_array" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" From 1677c4a3d57554aaa69fc0a299a5f8d46acb1aa3 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 9 Nov 2024 09:08:21 -0600 Subject: [PATCH 2/6] gdal: add libavif optional dependency --- pkgs/development/libraries/gdal/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a38ddad30e1c7..dd589ddd7eaa3 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,6 +9,7 @@ useArrow ? (!useMinimalFeatures), useHDF ? (!useMinimalFeatures), useJava ? (!useMinimalFeatures), + useLibAvif ? (!useMinimalFeatures), useLibHEIF ? (!useMinimalFeatures), useLibJXL ? (!useMinimalFeatures), useMysql ? (!useMinimalFeatures), @@ -42,6 +43,7 @@ json_c, lerc, libaom, + libavif, libde265, libdeflate, libgeotiff, @@ -137,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = let tileDbDeps = lib.optionals useTiledb [ tiledb ]; + libAvifDeps = lib.optionals useLibAvif [ libavif ]; libHeifDeps = lib.optionals useLibHEIF [ libheif dav1d @@ -205,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.numpy ] ++ tileDbDeps + ++ libAvifDeps ++ libHeifDeps ++ libJxlDeps ++ mysqlDeps From 411c5609d007709257005454f219b351f300892f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 20:40:56 +0000 Subject: [PATCH 3/6] pdal: add upstream patch for GDAL 3.10 --- pkgs/by-name/pd/pdal/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 2b43f15bef2ae..c4d3d758cbcea 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -2,6 +2,8 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch +, fetchurl , testers , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format @@ -37,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM="; }; + patches = [ + (fetchpatch { + name = "pdal-tests-gdal-3.10-compatibility.patch"; + url = "https://github.com/PDAL/PDAL/commit/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f.patch"; + hash = "sha256-8AeWcMeZXth6y+Ox1rhK7cEySql//Jig46rHw7PyJh4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -109,6 +119,14 @@ stdenv.mkDerivation (finalAttrs: { "pdal_app_plugin_test" ]; + # Add binary test file that we can’t apply from the patch. + postPatch = '' + ln -s ${fetchurl { + url = "https://github.com/PDAL/PDAL/raw/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f/test/data/gdal/1234_red_0_green_0_blue.tif"; + hash = "sha256-x/jHMhZTKmQxlTkswDGszhBIfP/qgY0zJ8QIz+wR5S4="; + }} test/data/gdal/1234_red_0_green_0_blue.tif + ''; + checkPhase = '' runHook preCheck # tests are flaky and they seem to fail less often when they don't run in From 07a1577c5b89e96f305bc99279ffc50b758002ed Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 21:52:45 +0000 Subject: [PATCH 4/6] python3Packages.rasterio: 1.4.0 -> 1.4.2 Diff: https://github.com/rasterio/rasterio/compare/refs/tags/1.4.0...1.4.2 Changelog: https://github.com/rasterio/rasterio/blob/1.4.2/CHANGES.txt --- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 30dd05cffbdd6..8c3f93fe617b2 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.4.0"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-A8o8FYuhlzL6Wl6sfB7D2KRAKZl28E6K2AdUik9zmgs="; + hash = "sha256-YGSd0IG6TWnHmDiVEE3F2KNQ4dXJhkPqAJsIrWyuHos="; }; postPatch = '' From e79d2ffbfca7767104945be334022138bdc3b2fa Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 22:58:07 +0000 Subject: [PATCH 5/6] python3Packages.rio-tiler: 7.0.1 -> 7.2.2 Diff: https://github.com/cogeotiff/rio-tiler/compare/refs/tags/7.0.1...7.2.2 --- pkgs/development/python-modules/rio-tiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 99c7f3d12df8b..c488b15fa0168 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "7.0.1"; + version = "7.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "cogeotiff"; repo = "rio-tiler"; rev = "refs/tags/${version}"; - hash = "sha256-E8gKXPj1n9HZ+zvQPcG28+2Vuif4B6NBhtuS009x6rU="; + hash = "sha256-uVLizNkUL7wGF0vFjPXb2iW9ILVkJcbDssXtp3E8ubE="; }; build-system = [ hatchling ]; From 55dda6c193a4670a3a15dbe829af64a85fb2aa62 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 30 Nov 2024 15:49:04 -0600 Subject: [PATCH 6/6] python3Packages.rio-tiler: mark broken https://github.com/cogeotiff/rio-tiler/issues/769 --- pkgs/development/python-modules/rio-tiler/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index c488b15fa0168..22fdd998b8c52 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -62,5 +62,8 @@ buildPythonPackage rec { homepage = "https://cogeotiff.github.io/rio-tiler/"; license = licenses.bsd3; maintainers = lib.teams.geospatial.members; + # Tests broken with gdal 3.10 + # https://github.com/cogeotiff/rio-tiler/issues/769 + broken = true; }; }