From 85f4a211df2edb9a11c5ab5a40a9e61db6bba94e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Nov 2023 20:58:43 +0100 Subject: [PATCH 1/5] mariadb_1010: remove --- pkgs/servers/sql/mariadb/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea50fc371981..8ef1e8eb1fef 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,13 +257,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.6"; - hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 version = "10.11.5"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c1acad2e8e9..52538eba3827 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ MACS2 = macs2; # Added 2023-06-12 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 + mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb085c1fb66e..3c9a5f7207d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26896,7 +26896,6 @@ with pkgs; inherit (import ../servers/sql/mariadb pkgs) mariadb_105 mariadb_106 - mariadb_1010 mariadb_1011 mariadb_110 ; From 3a58a7608e1550895e710f7c2e1eb6495bd9168f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Nov 2023 21:04:12 +0100 Subject: [PATCH 2/5] mariadb_105: https://mariadb.com/kb/en/mariadb-10-5-23-release-notes/ --- 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 8ef1e8eb1fef..bcd40cc9860e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -245,8 +245,8 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.22"; - hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; + version = "10.5.23"; + hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From fdcdba7cdb02c3dce01edd952955e44848515b29 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Nov 2023 21:04:26 +0100 Subject: [PATCH 3/5] mariadb_106: https://mariadb.com/kb/en/mariadb-10-6-16-release-notes/ --- 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 bcd40cc9860e..8839c1f70ad4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,8 +252,8 @@ in }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.15"; - hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; + version = "10.6.16"; + hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 315a76489ab5370da992c95e552a7480b9f5fed6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Nov 2023 21:05:00 +0100 Subject: [PATCH 4/5] mariadb_1011: https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/ --- 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 8839c1f70ad4..b299fba44b56 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -259,8 +259,8 @@ in }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.5"; - hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; + version = "10.11.6"; + hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 7394ec99a41777965e27f01d295e3b96e3940124 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 14 Nov 2023 21:05:56 +0100 Subject: [PATCH 5/5] mariadb_110: https://mariadb.com/kb/en/mariadb-11-0-4-release-notes/ --- 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 b299fba44b56..07c81ec1007c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -266,8 +266,8 @@ in }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.3"; - hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; + version = "11.0.4"; + hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; };