Skip to content

Commit

Permalink
Trouble with naersk
Browse files Browse the repository at this point in the history
Signed-off-by: Ana Hobden <operator@hoverbear.org>
  • Loading branch information
Hoverbear committed Jun 20, 2020
1 parent 44bbe30 commit 0836bcd
Show file tree
Hide file tree
Showing 5 changed files with 215 additions and 215 deletions.
80 changes: 35 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 9 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ rusoto_signature = { package = "rusoto_signature", version = "0.44.0", optional

# Tower
tower = "0.1.1"
tower03 = { package = "tower", version = "0.3", git = "https://github.com/tower-rs/tower", features = ["limit", "retry", "timeout", "util"] }
tower03 = { package = "tower", version = "0.3", git = "https://github.com/tower-rs/tower", features = ["limit", "retry", "timeout", "util"], rev = "c87fdd9c1e4c0728fdaa87d3fafe3e48da9b498a" }

# Serde
serde = { version = "1.0.80", features = ["derive"] }
Expand Down Expand Up @@ -119,7 +119,7 @@ syslog = "5"
syslog_loose = { version = "0.3.0", optional = true }
tokio-uds = { version = "0.2.5", optional = true }
derive_is_enum_variant = "0.1.1"
leveldb = { git = "https://github.com/timberio/leveldb", optional = true, default-features = false }
leveldb = { version = "0.8", optional = true, default-features = false }
db-key = "0.0.5"
headers = "0.2.1"
headers03 = { package = "headers", version = "0.3" }
Expand All @@ -128,7 +128,7 @@ hostname = "0.1.5"
seahash = { version = "3.0.6", optional = true }
jemallocator = { version = "0.3.0", optional = true }
lazy_static = "1.3.0"
rlua = { git = "https://github.com/kyren/rlua", optional = true }
rlua = { git = "https://github.com/kyren/rlua", optional = true, rev = "25bd7e6bffef9597466a98bfca80a3056c9e6320" }
num_cpus = "1.10.0"
bytesize = { version = "1.0.0", optional = true }
glob = "0.2.11"
Expand Down Expand Up @@ -158,9 +158,9 @@ pulsar = { version = "0.3.0", optional = true }
task-compat = "0.1"
# For WASM
vector-wasm = { path = "lib/vector-wasm", optional = true }
lucetc = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d4fc14a03bdb99ac83173d27fddf1aca48412a86", optional = true }
lucet-runtime = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d4fc14a03bdb99ac83173d27fddf1aca48412a86", optional = true }
lucet-wasi = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d4fc14a03bdb99ac83173d27fddf1aca48412a86", optional = true }
lucetc = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d741e2e30df19d1f8abd1a8660219ac494336b76", optional = true }
lucet-runtime = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d741e2e30df19d1f8abd1a8660219ac494336b76", optional = true }
lucet-wasi = { git = "https://github.com/bytecodealliance/lucet.git", rev = "d741e2e30df19d1f8abd1a8660219ac494336b76", optional = true }
anyhow = { version = "1.0.28", optional = true }


Expand Down Expand Up @@ -202,12 +202,11 @@ assert_cmd = "1.0"

[features]
# Default features for *-unknown-linux-gnu and *-apple-darwin
default = ["sources", "transforms", "sinks", "vendored", "unix", "leveldb-plain", "rdkafka-plain"]
default = ["sources", "transforms", "sinks", "vendored", "unix", "leveldb", "rdkafka-plain"]
# Default features for *-unknown-linux-* which make use of `cmake` for dependencies
default-cmake = ["sources", "transforms", "sinks", "vendored", "unix", "leveldb-cmake", "rdkafka-cmake"]
default-cmake = ["sources", "transforms", "sinks", "vendored", "unix", "rdkafka-cmake"]
# Default features for *-pc-windows-msvc
default-msvc = ["sources", "transforms", "sinks", "vendored", "leveldb-cmake", "rdkafka-cmake"]
default-nix = ["sources", "transforms", "sinks", "vendored", "unix", "leveldb-plain", "rdkafka", "rdkafka/dynamic_linking"]
default-msvc = ["sources", "transforms", "sinks", "vendored", "rdkafka-cmake"]

# Enables features that work only on systems providing `cfg(unix)
unix = ["jemallocator", "shiplift/unix-socket"]
Expand All @@ -219,10 +218,6 @@ rdkafka-plain = ["rdkafka"]
# This feature is more portable, but requires `cmake` as build dependency. Use it if `rdkafka-plain` doesn't work.
# The `sasl` feature has to be added because of the limitations of `librdkafka` build scripts for `cmake`.
rdkafka-cmake = ["rdkafka", "rdkafka/cmake-build"]
# This feature is less portable, but doesn't require `cmake` as build dependency
leveldb-plain = ["leveldb", "leveldb/leveldb-sys-2"]
# This feature is more portable, but requires `cmake` as build dependency. Use it if `leveldb-plain` doesn't work.
leveldb-cmake = ["leveldb", "leveldb/leveldb-sys-3"]
# This feature enables the WASM foreign module support.
wasm = ["lucetc", "lucet-runtime", "lucet-wasi", "vector-wasm", "anyhow"]
wasm-timings = ["wasm"]
Expand Down
Loading

0 comments on commit 0836bcd

Please sign in to comment.