From 32e59366dbc261fd8c08f8fcc8e6433273ef3b1d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 16 Feb 2023 22:18:35 +0100 Subject: [PATCH 1/2] mariadb: add more precise EOLs + link --- pkgs/servers/sql/mariadb/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 11ab668d6378..34c3de338313 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -239,6 +239,7 @@ let }; in self: { + # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 version = "10.4.28"; @@ -254,28 +255,28 @@ in inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { - # Supported until 2026-07 + # Supported until 2026-07-06 version = "10.6.12"; hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_108 = self.callPackage generic { - # Supported until 2023-05. TODO: remove ahead of 23.05 branchoff + # Supported until 2023-05-20. TODO: remove ahead of 23.05 branchoff version = "10.8.7"; hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_109 = self.callPackage generic { - # Supported until 2023-08. TODO: remove ahead of 23.05 branchoff? + # Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff? version = "10.9.5"; hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1010 = self.callPackage generic { - # Supported until 2023-11 + # Supported until 2023-11-17 version = "10.10.3"; hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130="; inherit (self.darwin) cctools; From 351e8a51c490befe7d623a0c178b0b9aa928c439 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 16 Feb 2023 22:21:08 +0100 Subject: [PATCH 2/2] mariadb_1011: init at 10.11.2 https://mariadb.org/mariadb-10-11-2-ga-now-available/ new LTS release! --- pkgs/servers/sql/mariadb/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 34c3de338313..4f3a19db7fea 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -282,4 +282,11 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; + mariadb_1011 = self.callPackage generic { + # Supported until 2028-02-16 + version = "10.11.2"; + hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw="; + inherit (self.darwin) cctools; + inherit (self.darwin.apple_sdk.frameworks) CoreServices; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84007288e933..719a0eab4804 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24907,6 +24907,7 @@ with pkgs; mariadb_108 mariadb_109 mariadb_1010 + mariadb_1011 ; mariadb = mariadb_106; mariadb-embedded = mariadb.override { withEmbedded = true; };