From 3edf3ba8f709c9c33d656ecea4099f0b8f398721 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:00:55 +0200 Subject: [PATCH 1/8] mariadb_108: 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 60a6c88c4dd6..ceefe78997dd 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -262,13 +262,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_108 = self.callPackage generic { - # 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-22. TODO: remove ahead of 23.05 branchoff? version = "10.9.5"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c22d2e9f65cd..25c01829a5fe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1007,6 +1007,7 @@ mapAliases ({ manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35078261a178..a4d31c1bee4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25656,7 +25656,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_108 mariadb_109 mariadb_1010 mariadb_1011 From 0a298d1cf1da167cef4022695a43bf4216f8ccaf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:02:12 +0200 Subject: [PATCH 2/8] mariadb_109: 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 ceefe78997dd..52be62a72a83 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -262,13 +262,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_109 = self.callPackage generic { - # 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-17 version = "10.10.3"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 25c01829a5fe..41301d6f8a34 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1008,6 +1008,7 @@ mapAliases ({ manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 + mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4d31c1bee4a..fbf5052a0680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25656,7 +25656,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_109 mariadb_1010 mariadb_1011 ; From c17a783c80896e691de97c0819f5a0c724cc65e8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:04:01 +0200 Subject: [PATCH 3/8] mariadb_104: 10.4.28 -> 10.4.29 https://mariadb.com/kb/en/mariadb-10-4-29-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 52be62a72a83..af0af0140849 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.28"; - hash = "sha256-AD/SPzxu5RYXbhtisLQ822zdPc1OMPhVwcWrK6r1qGw="; + version = "10.4.29"; + hash = "sha256-Wy0zh5LnnmjWpUXisVYDu792GMc55fgg9XsdayIJITA="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 3dc1bd1104ff47bb29865d4c7629251b0d292e81 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:05:39 +0200 Subject: [PATCH 4/8] mariadb_105: 10.5.19 -> 10.5.20 https://mariadb.com/kb/en/mariadb-10-5-20-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 af0af0140849..37629926d286 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.19"; - hash = "sha256-JExKJCSQZBBmI8uEqm3lFN3xeH3oZmQHUoK7qOxXV/Q="; + version = "10.5.20"; + hash = "sha256-sY+Q8NAR74e71VmtBDLN4Qfs21jqKCcQg7SJvf0e79s="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From b4213da2cf78691d3b5a9a49f43fd6b0a885d7ce Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:09:32 +0200 Subject: [PATCH 5/8] mariadb_106: 10.6.12 -> 10.6.13 https://mariadb.com/kb/en/mariadb-10-6-13-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 37629926d286..fd98168de636 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.12"; - hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo="; + version = "10.6.13"; + hash = "sha256-8IXzec9Z7S02VkT8XNhVj4gqiG7JZAcNZaKFMN27dbo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From e59deb59d70026acb14265bb995f286d03112768 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:09:54 +0200 Subject: [PATCH 6/8] mariadb_1010: 10.10.3 -> 10.10.4 https://mariadb.com/kb/en/mariadb-10-10-4-changelog/ --- 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 fd98168de636..6020684ab97b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -263,9 +263,9 @@ in inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17 - version = "10.10.3"; - hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130="; + # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff + version = "10.10.4"; + hash = "sha256-IX2Z47Ami5MizyicGEMnqHiYs/aGvS6eS5JpXqYRixk="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From d46e3b6a84a5d6c0ed73c715a0cf97672aea5cb6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:11:53 +0200 Subject: [PATCH 7/8] mariadb_1011: 10.11.2 -> 10.11.3 https://mariadb.com/kb/en/mariadb-10-11-3-release-notes/ --- 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 6020684ab97b..163b2672eaa1 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 - version = "10.11.2"; - hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw="; + # Supported until 2028-02-16. TODO: make this the default, at some point + version = "10.11.3"; + hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 81244087ab9e8fb996e1b4599d1a64598e5624e3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:13:38 +0200 Subject: [PATCH 8/8] nixosTests.mysql-replication: fix deprecation warning --- nixos/tests/mysql/mysql-replication.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index f6014019bd53..8f1695eb97e2 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -42,7 +42,7 @@ let enable = true; replication.role = "slave"; replication.serverId = 2; - replication.masterHost = nodes.primary.config.networking.hostName; + replication.masterHost = nodes.primary.networking.hostName; replication.masterUser = replicateUser; replication.masterPassword = replicatePassword; }; @@ -54,7 +54,7 @@ let enable = true; replication.role = "slave"; replication.serverId = 3; - replication.masterHost = nodes.primary.config.networking.hostName; + replication.masterHost = nodes.primary.networking.hostName; replication.masterUser = replicateUser; replication.masterPassword = replicatePassword; };