From 00abeb8e910e2bd29d2c056bdf61ffb372da8b45 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Aug 2023 13:16:19 +0200 Subject: [PATCH 1/5] mariadb_104: 10.4.30 -> 10.4.31 https://mariadb.com/kb/en/mariadb-10-4-31-release-notes/ (cherry picked from commit 01f9a554f5e981df9f296e8fa0e3158367712f7a) --- 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 5c7e336ca40f..5cfd51ad71b4 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.30"; - hash = "sha256-/LvaZxxseEwDFQJiYj8NgYlMkRUz58PCdvJW8voSEAw="; + version = "10.4.31"; + hash = "sha256-Uqv1Q0xqQuCgSKY6uZo4mPt/yhWA+t16Yb0OnOm4UFQ="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 0b982b9afef02cc2486880974dac8bb5ff025bda Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Aug 2023 13:17:04 +0200 Subject: [PATCH 2/5] mariadb_105: 10.5.21 -> 10.5.22 https://mariadb.com/kb/en/mariadb-10-5-22-release-notes/ (cherry picked from commit ce6608f77be9debf4104e51136840ca0f31f0e25) --- 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 5cfd51ad71b4..156dff09efc4 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.21"; - hash = "sha256-yn63Mo4cAunZCxPfNpW3+ni9c92ZykniPjLWzImCIkI="; + version = "10.5.22"; + hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 38a39efe4cff667a5386d1bb97544b7792a41e86 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Aug 2023 13:17:28 +0200 Subject: [PATCH 3/5] mariadb_106: 10.6.14 -> 10.6.15 https://mariadb.com/kb/en/mariadb-10-6-15-release-notes/ (cherry picked from commit 79f2db7ca2b53ac3ee28593df9005612df7afa48) --- 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 156dff09efc4..493436fdf96e 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.14"; - hash = "sha256-RQQ3x0qORMdrPAs0O5NH65AyAVRYUVZdeNmmJGdqsgI="; + version = "10.6.15"; + hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From cc2d5878e33ca9fe7f659160f8bcee77f8f2890e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Aug 2023 13:17:58 +0200 Subject: [PATCH 4/5] mariadb_1010: 10.10.5 -> 10.10.6 https://mariadb.com/kb/en/mariadb-10-10-6-release-notes/ (cherry picked from commit b14d7e88b0c8a33676ce5a1186168f869f5e26f3) --- 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 493436fdf96e..2b242a919dc1 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.5"; - hash = "sha256-kc1NQm04rwmFLr2vAOdCEXdexsyQf3TBruDUXN9dmWs="; + version = "10.10.6"; + hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From b2f6771ca0dacf546443c85a33c88440a53fc6d7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Aug 2023 13:18:42 +0200 Subject: [PATCH 5/5] mariadb_1011: 10.11.4 -> 10.11.5 https://mariadb.com/kb/en/mariadb-10-11-5-release-notes/ (cherry picked from commit a6e732f6a0e311254142a9ed9d05808060005dca) --- 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 2b242a919dc1..52930ddc927c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -271,8 +271,8 @@ in }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.4"; - hash = "sha256-zo2sElVozF9A2nTBchJ2fJLY+u2BBmWAtSakhaWREn0="; + version = "10.11.5"; + hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; };