From cc73325d45f63101e450eab54381f87e087dba0a Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Wed, 5 Feb 2025 13:50:12 +0100
Subject: [PATCH 1/2] mariadb: 10.5.28, 10.6.21,  10.11.11, 11.4.5

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index b3426a24a25b..232b10706468 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -365,26 +365,26 @@ self: {
   # see https://mariadb.org/about/#maintenance-policy for EOLs
   mariadb_105 = self.callPackage generic {
     # Supported until 2025-06-24
-    version = "10.5.27";
-    hash = "sha256-76ZPpfczuCKrGmeV4evBecFgwIaQ7Ncduh6w9hru3RQ=";
+    version = "10.5.28";
+    hash = "sha256-C1BwII2gEWZA8gvQhfETZSf5mMwjJocVvL81Lnt/PME=";
     inherit (self.darwin.apple_sdk.frameworks) CoreServices;
   };
   mariadb_106 = self.callPackage generic {
     # Supported until 2026-07-06
-    version = "10.6.20";
-    hash = "sha256-R/BavH2+uz8msx51AisbOWnbvEdSxK5wH4kgpgSJbUE=";
+    version = "10.6.21";
+    hash = "sha256-jX+XFps7ogRIWJZbjPwlQ2RADfQ+kFBC+S4kuPp7DZY=";
     inherit (self.darwin.apple_sdk.frameworks) CoreServices;
   };
   mariadb_1011 = self.callPackage generic {
     # Supported until 2028-02-16
-    version = "10.11.10";
-    hash = "sha256-sGp0ZQuDoWqpqwmJhEgrAo51sABnSxH/KIdyxhmm8CI=";
+    version = "10.11.11";
+    hash = "sha256-bynU1+QPxJr0oP5giYRQnvLRU9882K/kNZ3OPKDieJA=";
     inherit (self.darwin.apple_sdk.frameworks) CoreServices;
   };
   mariadb_114 = self.callPackage generic {
     # Supported until 2029-05-29
-    version = "11.4.4";
-    hash = "sha256-lvvS5uk/t+izc+6nXYW2/qV8DhEaAgkMu+/tUlmdx3s=";
+    version = "11.4.5";
+    hash = "sha256-/2WV+MSC+ZIeObl/oRIjd6afDcvZJVPGuQMsvw6bU1Q=";
     inherit (self.darwin.apple_sdk.frameworks) CoreServices;
   };
 }

From e5f5eff45c5a1cdaca359894455ed2b4f04bd9ab Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Thu, 6 Feb 2025 14:05:37 +0100
Subject: [PATCH 2/2] nixos/tests/mysql-autobackup: fix eval

---
 nixos/tests/mysql/mysql-autobackup.nix | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix
index 80dbb47adcd2..09de1d46f93c 100644
--- a/nixos/tests/mysql/mysql-autobackup.nix
+++ b/nixos/tests/mysql/mysql-autobackup.nix
@@ -20,19 +20,23 @@ let
       meta.maintainers = [ lib.maintainers.aanderse ];
 
       nodes.machine = {
-        services.mysql = {
-          inherit package;
-          enable = true;
-          initialDatabases = [
-            {
-              name = "testdb";
-              schema = ./testdb.sql;
-            }
-          ];
-        };
+        services = {
+          mysql = {
+            inherit package;
+            enable = true;
+            initialDatabases = [
+              {
+                name = "testdb";
+                schema = ./testdb.sql;
+              }
+            ];
+          };
 
-        services.automysqlbackup.enable = true;
-        automysqlbackup.settings.mysql_dump_port = "";
+          automysqlbackup = {
+            enable = true;
+            settings.mysql_dump_port = "";
+          };
+        };
       };
 
       testScript = ''