Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

mariadb_104: remove

depends on openssl_1_1, which is EOL

ajs124 b76116f9 863598fd

+6 -14
+5 -13
pkgs/servers/sql/mariadb/default.nix
··· 6 6 # Native buildInputs components 7 7 , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config 8 8 # Common components 9 - , curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2 9 + , curl, libiconv, ncurses, openssl, pcre2 10 10 , libkrb5, libaio, liburing, systemd 11 11 , CoreServices, cctools, perl 12 12 , jemalloc, less, libedit ··· 44 44 45 45 buildInputs = [ 46 46 libiconv ncurses zlib 47 + pcre2 48 + openssl 49 + curl 47 50 ] ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] 48 51 ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) 49 52 ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] 50 - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ] 51 - ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) 52 - ++ (if (lib.versionOlder version "10.5") 53 - then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] 54 - else [ openssl curl ]); 53 + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; 55 54 56 55 prePatch = '' 57 56 sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ··· 244 243 in 245 244 self: { 246 245 # see https://mariadb.org/about/#maintenance-policy for EOLs 247 - mariadb_104 = self.callPackage generic { 248 - # Supported until 2024-06-18 249 - version = "10.4.31"; 250 - hash = "sha256-Uqv1Q0xqQuCgSKY6uZo4mPt/yhWA+t16Yb0OnOm4UFQ="; 251 - inherit (self.darwin) cctools; 252 - inherit (self.darwin.apple_sdk.frameworks) CoreServices; 253 - }; 254 246 mariadb_105 = self.callPackage generic { 255 247 # Supported until 2025-06-24 256 248 version = "10.5.22";
+1
pkgs/top-level/aliases.nix
··· 1083 1083 manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 1084 1084 manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 1085 1085 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 1086 + mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 1086 1087 mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 1087 1088 mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 1088 1089 mariadb-client = hiPrio mariadb.client; #added 2019.07.28
-1
pkgs/top-level/all-packages.nix
··· 27105 27105 mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; 27106 27106 27107 27107 inherit (import ../servers/sql/mariadb pkgs) 27108 - mariadb_104 27109 27108 mariadb_105 27110 27109 mariadb_106 27111 27110 mariadb_1010