From 7d8acc3a9f4bd1dfc62801dcb652a9240be5405a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 18 Nov 2025 11:02:44 -0800
Subject: [PATCH] gdal: 3.11.4 -> 3.12.0

Diff: https://github.com/OSGeo/gdal/compare/v3.11.4...v3.12.0

Changelog: https://github.com/OSGeo/gdal/blob/v3.12.0/NEWS.md
---
 pkgs/by-name/gd/gdal/package.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 0ae4be009a2d..b8f523b2ab13 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"