From 5ac35160a4ab4b6f17a479eed5faf0ae77cecc9a Mon Sep 17 00:00:00 2001 From: frectonz Date: Sun, 7 Jul 2024 01:21:37 +0300 Subject: [PATCH] fix: vendor openssl --- Cargo.lock | 11 +++++++++++ Cargo.toml | 1 + flake.nix | 3 --- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16ccec5..f198225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2413,6 +2413,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.102" @@ -2421,6 +2430,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3205,6 +3215,7 @@ dependencies = [ "duckdb", "futures", "humantime", + "hyper-tls", "include_dir", "libsql", "mysql_async", diff --git a/Cargo.toml b/Cargo.toml index 74c6827..3be5c6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,7 @@ mysql_async = { version = "0.34.1", default-features = false, features = ["rustl duckdb = { git = "https://github.com/frectonz/duckdb-rs.git", features = ["bundled"] } humantime = "2.1.0" clickhouse = "0.11.6" +hyper-tls = { version = "0.5.0", features = ["vendored"] } [profile.release] strip = true diff --git a/flake.nix b/flake.nix index 38312f0..13371f0 100644 --- a/flake.nix +++ b/flake.nix @@ -90,9 +90,6 @@ pkgs.httpie pkgs.sqlite - - pkgs.openssl - pkgs.pkg-config ]; };