From 7952d7bc14c97c4b8e1c81e837e38853249947c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:42:27 +0100 Subject: [PATCH 1/6] mariadb_104: 10.4.26 -> 10.4.27 https://mariadb.com/kb/en/mariadb-10-4-27-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 19a81db9a364..41ab8343230f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -238,8 +238,8 @@ in self: { mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.26"; - hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; + version = "10.4.27"; + hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From b217e7dfcb3e6d5747eedf4d40060a0f26e3bd61 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:43:20 +0100 Subject: [PATCH 2/6] mariadb_105: 10.5.17 -> 10.5.18 https://mariadb.com/kb/en/mariadb-10-5-18-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 41ab8343230f..7d617825777b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -245,8 +245,8 @@ in }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.17"; - hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; + version = "10.5.18"; + hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 4a6b0747ed79496fff7e6c764e32b98355bbdd41 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:44:32 +0100 Subject: [PATCH 3/6] mariadb_106: 10.6.10 -> 10.6.11 https://mariadb.com/kb/en/mariadb-10-6-11-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 7d617825777b..d5471c38a4ef 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 - version = "10.6.10"; - hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c="; + version = "10.6.11"; + hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 91b70ce7aaa6ca6d400dfb88ae2377d4dffbe35b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:45:52 +0100 Subject: [PATCH 4/6] mariadb_108: 10.8.5 -> 10.8.6 https://mariadb.com/kb/en/mariadb-10-8-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 d5471c38a4ef..18567986df74 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -259,8 +259,8 @@ in }; mariadb_108 = self.callPackage generic { # Supported until 2023-05 - version = "10.8.5"; - hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos="; + version = "10.8.6"; + hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 0525d149504201b9d05e121847eb7883ce98a66a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 8 Nov 2022 12:47:20 +0100 Subject: [PATCH 5/6] mariadb_109: 10.9.3 -> 10.9.4 https://mariadb.com/kb/en/mariadb-10-9-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 18567986df74..829f33955e77 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -266,8 +266,8 @@ in }; mariadb_109 = self.callPackage generic { # Supported until 2023-08 - version = "10.9.3"; - hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4="; + version = "10.9.4"; + hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From d0e4c10df522e82ade423ea3a2d15a3d39030e61 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 10 Jan 2023 15:07:51 +0100 Subject: [PATCH 6/6] mariadb: fix darwin build --- pkgs/servers/sql/mariadb/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 829f33955e77..9eacea78a37e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -96,6 +96,9 @@ let # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [ + # workaround for https://jira.mariadb.org/browse/MDEV-29925 + "-Dhave_C__Wl___as_needed=" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # revisit this if nixpkgs supports any architecture whose stack grows upwards "-DSTACK_DIRECTION=-1"