diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fae12db390f..ea50fc37198 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"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c04676e2597..53d38a973ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1084,6 +1084,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_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35202c1f63d..8d576ea2a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27110,7 +27110,6 @@ with pkgs; mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; inherit (import ../servers/sql/mariadb pkgs) - mariadb_104 mariadb_105 mariadb_106 mariadb_1010