From 9ce3ec1b92c7922f57fbecc673c07c3de28df792 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 22 Jun 2026 07:54:46 +0200 Subject: [PATCH 1/4] mariadb_106: 10.6.24 -> 10.6.27 Changelog: - https://mariadb.com/docs/release-notes/community-server/10.6/10.6.25 - https://mariadb.com/docs/release-notes/community-server/10.6/10.6.26 - https://mariadb.com/docs/release-notes/community-server/10.6/10.6.27 --- 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 4f44473df795..d68105b9857d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -382,8 +382,8 @@ self: { # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.24"; - hash = "sha256-SeK63GdFcMhg48t6LAFhJKpmKMlfMBMwMEEeXImqFy8="; + version = "10.6.27"; + hash = "sha256-jrdq07Gz0UxWYRzMkQQoFB/lYWAEOBnmR0FgOF9pZl4="; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 From 88ce9b04e97d22a1a78fd9915d4fd1790d868187 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 22 Jun 2026 07:56:28 +0200 Subject: [PATCH 2/4] mariadb_1011: 10.11.15 -> 10.11.18 Changelog: - https://mariadb.com/docs/release-notes/community-server/10.11/10.11.16 - https://mariadb.com/docs/release-notes/community-server/10.11/10.11.17 - https://mariadb.com/docs/release-notes/community-server/10.11/10.11.18 --- pkgs/servers/sql/mariadb/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d68105b9857d..f8df4f0803e4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -359,8 +359,20 @@ let + lib.optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' - + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.4") '' - mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + + + lib.optionalString + ( + !stdenv.hostPlatform.isDarwin + && lib.versionAtLeast common.version "10.6" + && lib.versionOlder common.version "10.11" + ) + '' + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.11") '' + mv "$out"/lib/mysql/plugin/test_pam_modules/pam_mariadb_mtr.so "$out"/share/pam/lib/security + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.6") '' mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security rm -r "$out"/OFF ''; @@ -387,8 +399,8 @@ self: { }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.15"; - hash = "sha256-UxHoV2VAK95agamnsmQ6c3jSAxaigiv61LbdzxBHWaU="; + version = "10.11.18"; + hash = "sha256-pGhSxoB1vnwxx7M/7iM8W1oAyMKBF/UgTRJOTy/Vb6g="; }; mariadb_114 = self.callPackage generic { # Supported until 2029-05-29 From 0fe0c7d6ad5fcf6c6ec289c762e77c736938e9e3 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 22 Jun 2026 07:57:07 +0200 Subject: [PATCH 3/4] mariadb_114: 11.4.9 -> 11.4.12 Changelog: - https://mariadb.com/docs/release-notes/community-server/11.4/11.4.10 - https://mariadb.com/docs/release-notes/community-server/11.4/11.4.11 - https://mariadb.com/docs/release-notes/community-server/11.4/11.4.12 --- 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 f8df4f0803e4..b43235ec18a9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -404,8 +404,8 @@ self: { }; mariadb_114 = self.callPackage generic { # Supported until 2029-05-29 - version = "11.4.9"; - hash = "sha256-jkgcoptadARE1FRRyOotk3Ec9SXW+l0nvJUSz4lzsHU="; + version = "11.4.12"; + hash = "sha256-WreIPbUZv86/3SqsCbxVRKEs4yjznt1G0L8BaQYV72w="; }; mariadb_118 = self.callPackage generic { # Supported until 2028-06-04 From 542c1f548c14b846768c27f5ec8115b82b087fae Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 22 Jun 2026 07:57:34 +0200 Subject: [PATCH 4/4] mariadb_118: 11.8.5 -> 11.8.8 Changelog: - https://mariadb.com/docs/release-notes/community-server/11.8/11.8.6 - https://mariadb.com/docs/release-notes/community-server/11.8/11.8.7 - https://mariadb.com/docs/release-notes/community-server/11.8/11.8.8 --- 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 b43235ec18a9..347a8f318b0a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -409,7 +409,7 @@ self: { }; mariadb_118 = self.callPackage generic { # Supported until 2028-06-04 - version = "11.8.5"; - hash = "sha256-vLc5RWnAiHfCg+FkmGlQRTG+6MqvowKI8HjjDZn8ufY="; + version = "11.8.8"; + hash = "sha256-vQI6SVn68BLbfw6/wNJ2cp5n5UQ98ZMWP5jYD9/FJMk="; }; }