From de199835d04653a461960f5821a30c34dc06c597 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 22 Apr 2025 14:44:34 +0200 Subject: [PATCH] mariadb_105: remove due to EOL End of life is on 2025-06-24, see https://mariadb.org/about/#maintenance-policy --- doc/release-notes/rl-2505.section.md | 2 ++ pkgs/servers/sql/mariadb/default.nix | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 5c7131be2f7d..08ac4a7c3f98 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -95,6 +95,8 @@ - `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process. +- `mariadb_105` has been removed as it has reached end-of-life in 2025-06. Please update to `mariadb_106`. + - NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0) and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 232b10706468..da1630b4625c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -362,13 +362,8 @@ let }; in self: { + mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # see https://mariadb.org/about/#maintenance-policy for EOLs - mariadb_105 = self.callPackage generic { - # Supported until 2025-06-24 - 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.21";