From e547013e69f8bf0fdb5aa7fd80e55509c63242cd Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 7 Jun 2023 13:05:57 +0200
Subject: [PATCH 1/2] mariadb_110: init at 11.0.2

https://mariadb.com/kb/en/changes-improvements-in-mariadb-11-0/
---
 pkgs/servers/sql/mariadb/default.nix | 7 +++++++
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 163b2672eaa..8965cf465b4 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -276,4 +276,11 @@ in
       inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
+    mariadb_110 = self.callPackage generic {
+      # Supported until 2024-06-07
+      version = "11.0.2";
+      hash = "sha256-PHFXbK0OpBaIInDjg/lMyJaTt/vM4fpPMG/j6THkZK4=";
+      inherit (self.darwin) cctools;
+      inherit (self.darwin.apple_sdk.frameworks) CoreServices;
+    };
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b6c8d90e5..dccd0bf974d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25977,6 +25977,7 @@ with pkgs;
     mariadb_106
     mariadb_1010
     mariadb_1011
+    mariadb_110
   ;
   mariadb = mariadb_106;
   mariadb-embedded = mariadb.override { withEmbedded = true; };

From 34eaaf331c89f3c95e8dd79bcb675d4d66a9677e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 7 Jun 2023 13:07:07 +0200
Subject: [PATCH 2/2] mariadb: upgrade default from 10.6 to 10.11

which is the next LTS release
---
 nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++
 pkgs/servers/sql/mariadb/default.nix              | 2 +-
 pkgs/top-level/all-packages.nix                   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 08c316a123c..7d1affe60da 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -24,6 +24,8 @@
 
 - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
 
+- `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues.
+
 - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
 
 - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 8965cf465b4..ee118b89b4a 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -270,7 +270,7 @@ in
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_1011 = self.callPackage generic {
-      # Supported until 2028-02-16. TODO: make this the default, at some point
+      # Supported until 2028-02-16
       version = "10.11.3";
       hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc=";
       inherit (self.darwin) cctools;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dccd0bf974d..1cd1dcdcf4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25979,7 +25979,7 @@ with pkgs;
     mariadb_1011
     mariadb_110
   ;
-  mariadb = mariadb_106;
+  mariadb = mariadb_1011;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
   mongodb = hiPrio mongodb-6_0;