From c6eaf120506c12e1b506721bc7bb59617d6ab5f1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Jun 2023 15:33:43 +0200 Subject: [PATCH 1/5] mariadb_104: 10.4.29 -> 10.4.30 https://mariadb.com/kb/en/mariadb-10-4-30-release-notes/ (cherry picked from commit 17d3aa742213ecd3d1a6608eff7a7c01c3fd7eb2) --- 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 163b2672eaa1..9a9b9b884231 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -243,8 +243,8 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.29"; - hash = "sha256-Wy0zh5LnnmjWpUXisVYDu792GMc55fgg9XsdayIJITA="; + version = "10.4.30"; + hash = "sha256-/LvaZxxseEwDFQJiYj8NgYlMkRUz58PCdvJW8voSEAw="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 39c864cfe49fe76847e15a3b4a36c7bfd473f495 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Jun 2023 15:34:08 +0200 Subject: [PATCH 2/5] mariadb_105: 10.5.20 -> 10.5.21 https://mariadb.com/kb/en/mariadb-10-5-21-release-notes/ (cherry picked from commit 04e9ffc0bc4a87da33ec324fe8422e4dfd361e07) --- 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 9a9b9b884231..2cd53f3a8ef9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -250,8 +250,8 @@ in }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.20"; - hash = "sha256-sY+Q8NAR74e71VmtBDLN4Qfs21jqKCcQg7SJvf0e79s="; + version = "10.5.21"; + hash = "sha256-yn63Mo4cAunZCxPfNpW3+ni9c92ZykniPjLWzImCIkI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From ecd443a00e5412e6be32052be60d259208423e3c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Jun 2023 15:34:33 +0200 Subject: [PATCH 3/5] mariadb_106: 10.6.13 -> 10.6.14 https://mariadb.com/kb/en/mariadb-10-6-14-release-notes/ (cherry picked from commit 2278f07723f0d30767a4b27f7afd0ac3ab46a8bf) --- 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 2cd53f3a8ef9..4686a1d48006 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,8 +257,8 @@ in }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.13"; - hash = "sha256-8IXzec9Z7S02VkT8XNhVj4gqiG7JZAcNZaKFMN27dbo="; + version = "10.6.14"; + hash = "sha256-RQQ3x0qORMdrPAs0O5NH65AyAVRYUVZdeNmmJGdqsgI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 2c0cdc7439b81c96e4186f42dab69b15dbaa6f54 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Jun 2023 15:34:53 +0200 Subject: [PATCH 4/5] mariadb_1010: 10.10.4 -> 10.10.5 https://mariadb.com/kb/en/mariadb-10-10-5-release-notes/ (cherry picked from commit 78e4cc189e3ac134339d72c1b940ee3d7368c596) --- 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 4686a1d48006..5cd4217b3015 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -264,8 +264,8 @@ in }; mariadb_1010 = self.callPackage generic { # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.4"; - hash = "sha256-IX2Z47Ami5MizyicGEMnqHiYs/aGvS6eS5JpXqYRixk="; + version = "10.10.5"; + hash = "sha256-kc1NQm04rwmFLr2vAOdCEXdexsyQf3TBruDUXN9dmWs="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 1e54b726a4efcb837062e3cfd38ea77e19310d39 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Jun 2023 15:35:12 +0200 Subject: [PATCH 5/5] mariadb_1011: 10.11.3 -> 10.11.4 https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/ (cherry picked from commit ed5a9f057427eda4c393f209431017bddc62a654) --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 5cd4217b3015..5c7e336ca40f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -270,9 +270,9 @@ 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 - version = "10.11.3"; - hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc="; + # Supported until 2028-02-16 + version = "10.11.4"; + hash = "sha256-zo2sElVozF9A2nTBchJ2fJLY+u2BBmWAtSakhaWREn0="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; };