diff options
author | ajs124 <git@ajs124.de> | 2023-09-11 17:51:07 +0200 |
---|---|---|
committer | ajs124 <git@ajs124.de> | 2023-09-11 17:51:56 +0200 |
commit | b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd (patch) | |
tree | 0be6765fa1cb84ab88762629849cd90ace565272 /pkgs/servers/sql/mariadb | |
parent | 863598fdfca2d0609fc1578cff0c3ec27fd13d9b (diff) | |
download | nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar.gz nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar.bz2 nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar.lz nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar.xz nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.tar.zst nixlib-b76116f9bc98ee1925d7f1fbdc29c17bdf7630cd.zip |
mariadb_104: remove
depends on openssl_1_1, which is EOL
Diffstat (limited to 'pkgs/servers/sql/mariadb')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fae12db390f2..ea50fc371981 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -6,7 +6,7 @@ let # Native buildInputs components , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config # Common components - , curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2 + , curl, libiconv, ncurses, openssl, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl , jemalloc, less, libedit @@ -44,14 +44,13 @@ let buildInputs = [ libiconv ncurses zlib + pcre2 + openssl + curl ] ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ] - ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) - ++ (if (lib.versionOlder version "10.5") - then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] - else [ openssl curl ]); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -244,13 +243,6 @@ let in self: { # see https://mariadb.org/about/#maintenance-policy for EOLs - mariadb_104 = self.callPackage generic { - # Supported until 2024-06-18 - version = "10.4.31"; - hash = "sha256-Uqv1Q0xqQuCgSKY6uZo4mPt/yhWA+t16Yb0OnOm4UFQ="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 version = "10.5.22"; |