From 9a988edb4a096b0e9075396b2c6d9747b572300e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 9 Sep 2025 19:59:37 +0100
Subject: [PATCH 1/3] mariadb-connector-c_{3_1,3_2,3_3}: conditionalize GCC 15
 patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This won’t be needed for 3.4 when that version is added, but will
stay around for older versions.
---
 pkgs/servers/sql/mariadb/connector-c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index f3ae54e43a5a..628bf08c79aa 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
     inherit hash;
   };
 
-  patches = [
+  patches = lib.optionals (lib.versionOlder version "3.4") [
     # fix compilation against gcc15
     (fetchpatch {
       url = "https://github.com/mariadb-corporation/mariadb-connector-c/commit/e8448137f3365568090d5c0d4051039ddc1cdb6f.patch";

From de37ac59a476c32e094a5abb7ea8295e65f86705 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 9 Sep 2025 19:59:37 +0100
Subject: [PATCH 2/3] mariadb-connector-c_{3_1,3_2,3_3}: backport patch for
 CMake 4

---
 pkgs/servers/sql/mariadb/connector-c/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 628bf08c79aa..969cf26b5b4c 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -35,6 +35,13 @@ stdenv.mkDerivation {
       url = "https://github.com/mariadb-corporation/mariadb-connector-c/commit/e8448137f3365568090d5c0d4051039ddc1cdb6f.patch";
       hash = "sha256-aDbaaJA8DxGG5RrOa+CHhk4wuzlBy5tWyS+f/zVYU0c=";
     })
+
+    # Fix the build with CMake 4.
+    (fetchpatch {
+      name = "mariadb-connector-c-fix-cmake-4.patch";
+      url = "https://github.com/mariadb-corporation/mariadb-connector-c/commit/598dc3d2d7a63e5d250421dd0ea88be55ea8511f.patch";
+      hash = "sha256-HojNRobguBmtpEdr2lVi/MpcoDAsZnb3+tw/pt376es=";
+    })
   ];
 
   outputs = [

From 9e4b2ce5c7c2a086eb3183f3523a89f131cddb6d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 9 Sep 2025 19:59:37 +0100
Subject: [PATCH 3/3] unixODBCDrivers.mariadb: 3.1.20 -> 3.2.6

Diff: https://github.com/mariadb-corporation/mariadb-connector-odbc/compare/3.1.20...3.2.6
---
 pkgs/development/libraries/unixODBCDrivers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 69edb001df39..42b9e2682686 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -42,13 +42,13 @@
 
   mariadb = stdenv.mkDerivation rec {
     pname = "mariadb-connector-odbc";
-    version = "3.1.20";
+    version = "3.2.6";
 
     src = fetchFromGitHub {
       owner = "mariadb-corporation";
       repo = "mariadb-connector-odbc";
       rev = version;
-      hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws=";
+      hash = "sha256-FdnA3/xDxnk2910LCMPWQTcUUSYfUsnnZ3Hqj0uey5s=";
       # this driver only seems to build correctly when built against the mariadb-connect-c subrepo
       # (see https://github.com/NixOS/nixpkgs/issues/73258)
       fetchSubmodules = true;