Skip to content

DO NOT MERGE: CI check against ngrok-rust PR #203 (Rust 2024 + dep bumps) #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bmpngrok wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DO NOT MERGE: CI check against ngrok-rust PR #203 (Rust 2024 + dep bumps) #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 14 additions & 65 deletions Cargo.lock
View file
Open in desktop

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

11 changes: 9 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,20 @@ rustls-pemfile = "2.0.0"
tokio = { version = "1.40", features = ["sync"] }
tracing = { version = "0.1.37", features = ["log", "log-always"] }
url = "2.4.0"
aws-lc-sys = { version = "=0.28.0", features = ["bindgen"] }
aws-lc-rs = "=1.13.0"
aws-lc-sys = { version = "=0.41.0", features = ["bindgen"] }
aws-lc-rs = "=1.17.0"

[build-dependencies]
prost-build = "0.13.5"
pyo3-build-config = "0.24"

# TEMPORARY: build against the unmerged ngrok-rust PR #203 (edition 2024 + dep bumps).
# https://github.com/ngrok/ngrok-rust/pull/203
# Remove this patch (and revert the aws-lc-sys/aws-lc-rs bumps if needed) once
# that lands and a new ngrok release is published, then bump the `ngrok` version.
[patch.crates-io]
ngrok = { git = "https://github.com/ngrok/ngrok-rust", branch = "bmps/bump-the-security-deps" }

[profile.release]
lto = true

Expand Down
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

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

4 changes: 1 addition & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,12 @@
LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib";
buildInputs = with pkgs; [
toolchain
python-toolchain
llvm-toolchain
fix-n-fmt
setup-hooks
cargo-udeps
semver-checks
extract-version
] ++ lib.optionals stdenv.isDarwin [
] ++ python-toolchain ++ llvm-toolchain ++ lib.optionals stdenv.isDarwin [
# nix darwin stdenv has broken libiconv: https://github.com/NixOS/nixpkgs/issues/158331
libiconv
pkgs.darwin.apple_sdk.frameworks.Security
Expand Down
Loading