From e15d2f0e2c911f806e7f8e183bc55d896cfbc97b Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 19 Jan 2023 00:41:40 +1000 Subject: [PATCH] Fix accidental inclusion of openssl dependency in Linux builds https://forums.ankiweb.net/t/anki-2-1-57-beta/26494/2 --- .config/hakari.toml | 5 +++++ Cargo.lock | 1 - tools/workspace-hack/Cargo.toml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index 1858c8428..6b7edcf97 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -1,3 +1,8 @@ hakari-package = "workspace-hack" dep-format-version = "2" resolver = "2" + +[traversal-excludes] +third-party = [ + { name = "reqwest" }, +] diff --git a/Cargo.lock b/Cargo.lock index 2dbb1ceb6..2a81d69aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4706,7 +4706,6 @@ dependencies = [ "rand_core 0.6.4", "regex", "regex-syntax", - "reqwest", "scopeguard", "serde", "serde_json", diff --git a/tools/workspace-hack/Cargo.toml b/tools/workspace-hack/Cargo.toml index 5707e4908..0291ae39e 100644 --- a/tools/workspace-hack/Cargo.toml +++ b/tools/workspace-hack/Cargo.toml @@ -37,7 +37,6 @@ rand-ca01ad9e24f5d932 = { package = "rand", version = "0.7", features = ["alloc" rand_core = { version = "0.6", default-features = false, features = ["alloc", "getrandom", "std"] } regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } -reqwest = { version = "0.11", features = ["__rustls", "__tls", "blocking", "default-tls", "hyper-rustls", "hyper-tls", "json", "mime_guess", "multipart", "native-tls", "native-tls-crate", "rustls", "rustls-native-certs", "rustls-pemfile", "rustls-tls", "rustls-tls-native-roots", "rustls-tls-webpki-roots", "serde_json", "socks", "stream", "tokio-native-tls", "tokio-rustls", "tokio-socks", "tokio-util", "webpki-roots"] } scopeguard = { version = "1", features = ["use_std"] } serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] } serde_json = { version = "1", features = ["raw_value", "std"] }