diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2023-01-13 17:36:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-13 17:36:12 +0100 |
| commit | 7345f80950f07abd5ae9a896853b30ff29af3331 (patch) | |
| tree | f894dd966f6dc70d3274ce5c1e56d5533723c498 | |
| parent | e285dd0ca97c264003867c7329f0d1f4f028739c (diff) | |
| parent | a4572378e0831a813d4e0f5f122269fa35ca4d22 (diff) | |
Merge pull request #210447 from NixOS/backport-200197-to-release-22.11
[Backport release-22.11] MariaDB: 10.9.4, 10.8.6, 10.6.11, 10.5.18 and 10.4.27
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 19a81db9a364..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" @@ -238,36 +241,36 @@ 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; }; 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; }; 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; }; 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; }; 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; }; |