From b802fc1e5c6aae7a8800433938cbba7df707bed0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jun 2022 00:15:04 +0200 Subject: [PATCH] mysql80: pin to openssl_1_1 --- pkgs/servers/sql/mysql/8.0.x.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index a59bd44fb028..d40d42a41d07 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -23,7 +23,7 @@ self = stdenv.mkDerivation rec { ''; buildInputs = [ - boost curl icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib + boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib zstd libfido2 ] ++ lib.optionals stdenv.isLinux [ numactl libtirpc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c96e59a7a96..7c692ab1e875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23024,6 +23024,7 @@ with pkgs; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; icu = icu69; + openssl = openssl_1_1; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };