diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index 97c48a74913c..8769439981f1 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -3,7 +3,6 @@ stdenv, callPackage, fetchFromGitHub, - fetchpatch, useMinimalFeatures ? false, useArmadillo ? (!useMinimalFeatures), @@ -84,23 +83,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.11.4"; + version = "3.12.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; tag = "v${finalAttrs.version}"; - hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0="; + hash = "sha256-al7nDmUbKNP4kBMVBLWUUxn0QSAbYAJ1XhZWAVFk+sA="; }; - patches = [ - (fetchpatch { - name = "fix-build-poppler-25.10.0.patch"; - url = "https://github.com/OSGeo/gdal/commit/a716a6cd5ffd779b30950f046fce91878fc97b9d.patch"; - hash = "sha256-dSotpnTiMjt3Bz63hpNjF5juZ3JsjIpD59/67cR9rNU="; - }) - ]; - nativeBuildInputs = [ bison cmake @@ -273,6 +264,8 @@ stdenv.mkDerivation (finalAttrs: { disabledTests = [ # tests that attempt to make network requests "test_jp2openjpeg_45" + "test_ogr_gmlas_datetime" + "test_vrtrawlink_GDAL_VRT_RAWRASTERBAND_ALLOWED_SOURCE_ONLY_REMOTE_accepted" # tests that require the full proj dataset which we don't package yet # https://github.com/OSGeo/gdal/issues/5523 "test_transformer_dem_overrride_srs" diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix index f34100339455..f20f0d193a4d 100644 --- a/pkgs/by-name/me/merkaartor/package.nix +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, + cmake, pkg-config, gdal, @@ -29,6 +31,15 @@ stdenv.mkDerivation rec { hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; }; + patches = [ + # Fix for GDAL 3.12 + # https://github.com/openstreetmap/merkaartor/pull/316 + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/28cca84e9f5db0aaba87c2084ed32f9677598823.diff"; + hash = "sha256-so0La5djYhWF6NqLpShWa3vGl5A2jkS3Xwg5Pe1yse4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -71,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://merkaartor.be/"; license = lib.licenses.gpl2Plus; mainProgram = "merkaartor"; - maintainers = with lib.maintainers; [ sikmir ]; + teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix index 5febf925ebfc..f1b433ee31b0 100644 --- a/pkgs/by-name/ot/otb/package.nix +++ b/pkgs/by-name/ot/otb/package.nix @@ -216,22 +216,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "otb"; - version = "10.0-unstable-2025-04-03"; + version = "10.0-unstable-2025-12-11"; src = fetchFromGitHub { owner = "orfeotoolbox"; repo = "otb"; - rev = "93649b68f54975a1a48a0acd49f2602a55fc8032"; - hash = "sha256-S6yhV//qlKdWWcT9J1p64WuVS0QNepIYTr/t4JvyEwE="; + rev = "2dd72c102a0a95794c0cc3e7da1843bc67537f6e"; + hash = "sha256-dLphF4h/QkO/lSVEmVUPuRRGDU5SRhNLoxXxHWpINbU="; }; patches = [ - # fixes for gdal 10 - # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/merge_requests/1056 - (fetchpatch { - url = "https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/merge_requests/1056/diffs.patch"; - hash = "sha256-Zj/wkx0vxn5vqj0hszn7NxoYW1yf63G3HPVKbSdZIOY="; - }) ./1-otb-swig-include-itk.diff ]; diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index 47fb21c962ea..64540c343c97 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { - owner = "eclipse"; + owner = "eclipse-sumo"; repo = "sumo"; tag = "v${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-xf7/hUJpl+XmXx5MmFzYu2geFNe7JVaxDrraoqLrSuk="; + hash = "sha256-rUa5DpoBfnviSEmzPEiVnZU0KGavAIOFoysQ74uTll0="; fetchSubmodules = true; }; @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/eclipse/sumo"; license = lib.licenses.epl20; maintainers = [ ]; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 53c1513e2c9d..dd0af137a3df 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,10 +6,12 @@ # build-system cython, - gdal, numpy, setuptools, + # non-Python dependencies + gdal-cpp, + # dependencies affine, attrs, @@ -36,28 +38,39 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; tag = version; - hash = "sha256-InejYBRa4i0E2GxEWbtBpaErtcoYrhtypAlRtMlUoDk="; + hash = "sha256-6y55JJ3R/JEEneM10UPHIDpSopaybY5XHJPiU+77ke4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "cython~=3.0.2" cython + --replace-fail "cython~=3.1.0" cython ''; build-system = [ cython - gdal numpy setuptools ]; + nativeBuildInputs = [ + gdal-cpp # for gdal-config + ]; + + buildInputs = [ + gdal-cpp + ]; + + pythonRelaxDeps = [ + "click" + ]; + dependencies = [ affine attrs diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8efb07d09bf4..ac8cf73dc00c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16077,7 +16077,9 @@ self: super: with self; { raspyrfm-client = callPackage ../development/python-modules/raspyrfm-client { }; - rasterio = callPackage ../development/python-modules/rasterio { }; + rasterio = callPackage ../development/python-modules/rasterio { + gdal-cpp = pkgs.gdal; + }; ratarmount = callPackage ../development/python-modules/ratarmount { };