From 74497d0d54f6c6aa1947163647b6add2d497f7a4 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 9 Feb 2022 22:21:00 +0100
Subject: [PATCH 1/5] mariadb_104: 10.4.22 -> 10.4.23

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index fb07bc39154d..cd5c44ddde72 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -235,8 +235,8 @@ in stdenv.mkDerivation (common // {
 in {
   mariadb_104 = mariadbPackage {
     # Supported until 2024-06-18
-    version = "10.4.22";
-    sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4";
+    version = "10.4.23";
+    sha256 = "1wlhjd1xvk6p2lb93v8kfjk1scyjz882fx0i0sjyyk047mh2i852";
   };
   mariadb_105 = mariadbPackage {
     # Supported until 2025-06-24

From a8b3820bf773f72882d1271d53570fd629663419 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 9 Feb 2022 22:21:14 +0100
Subject: [PATCH 2/5] mariadb_105: 10.5.13 -> 10.5.14

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index cd5c44ddde72..1d1265b29771 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -240,8 +240,8 @@ in {
   };
   mariadb_105 = mariadbPackage {
     # Supported until 2025-06-24
-    version = "10.5.13";
-    sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n";
+    version = "10.5.14";
+    sha256 = "02y292mfvr6ils4m61lh9vy74z3w2xkz6xinpgg9wl5h7q29gzaf";
   };
   mariadb_106 = mariadbPackage {
     # Supported until 2026-07

From d70e970e48589c25ec473fe6ab71291d8150dfc2 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 9 Feb 2022 22:22:34 +0100
Subject: [PATCH 3/5] mariadb_106: 10.6.5 -> 10.6.6

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 1d1265b29771..971288a36611 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -245,7 +245,7 @@ in {
   };
   mariadb_106 = mariadbPackage {
     # Supported until 2026-07
-    version = "10.6.5";
-    sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0";
+    version = "10.6.6";
+    sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77";
   };
 }

From 6e779c3b05b963f1184c39d311218490f44469f2 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 9 Feb 2022 22:22:56 +0100
Subject: [PATCH 4/5] mariadb_107: init at 10.7.2

---
 pkgs/servers/sql/mariadb/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 971288a36611..33ac06963248 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -10,6 +10,7 @@
 , bzip2, lz4, lzo, snappy, xz, zlib, zstd
 , cracklib, judy, libevent, libxml2
 , linux-pam, numactl, pmdk
+, fmt_8
 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
 , withStorageRocks ? true
 }:
@@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
     ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
-    ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ];
+    ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
+    ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];
 
   patches = common.patches;
 
@@ -248,4 +250,9 @@ in {
     version = "10.6.6";
     sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77";
   };
+  mariadb_107 = mariadbPackage {
+    # Supported until 2023-02
+    version = "10.7.2";
+    sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21e9c3b1f907..dcaf74238df4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21502,6 +21502,7 @@ with pkgs;
     mariadb_104
     mariadb_105
     mariadb_106
+    mariadb_107
   ;
   mariadb = mariadb_106;
 

From 21ca2a9da0008ce98407ccf2fb7ec608d86c0637 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 9 Feb 2022 22:23:08 +0100
Subject: [PATCH 5/5] mariadb_108: init at 10.8.1

---
 pkgs/servers/sql/mariadb/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 33ac06963248..3254b6f23271 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -255,4 +255,9 @@ in {
     version = "10.7.2";
     sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p";
   };
+  mariadb_108 = mariadbPackage {
+    # Supported until 2023-05
+    version = "10.8.1";
+    sha256 = "0ns0z8w3374jrfdrmq7ncag089xwmf7wkr5aq3p9shk1b5mln9z2";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcaf74238df4..b55306e3e7ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21503,6 +21503,7 @@ with pkgs;
     mariadb_105
     mariadb_106
     mariadb_107
+    mariadb_108
   ;
   mariadb = mariadb_106;