Skip to content

chore: source a Cargo.lock in ffi crate to help Nix build it #54

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

Closed
beltram wants to merge 3 commits into from
Closed

chore: source a Cargo.lock in ffi crate to help Nix build it #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
372dd32
chore: source a Cargo.lock in ffi crate to help Nix build it
beltram Mar 15, 2023
f07969f
build: pin patches by revision and not by tag
beltram Mar 15, 2023
1e68fad
build: turn off ring's git detection
beltram Mar 15, 2023
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
7 changes: 7 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[env]
# ? Ring treats warnings as errors during local development by detecting
# ? the presence of a `.git` folder
# ? With us having a git dependency to ring, this triggers this local development behavior, preventing
# ? release builds on certain platforms. Gotta love build systems that are "UB as a service"
# TODO: Remove this once we target a crates.io version of ring. Probably never!
CFLAGS="-Wno-error=inline"
12 changes: 8 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@ resolver = "2"

[patch.crates-io.biscuit]
git = "https://github.com/beltram/biscuit"
tag = "v0.6.0-pre.core-crypto-0.6.0"
rev = "36b6f30964142f0ca5bc17c908e8b2ad78febaf6"
#tag = "v0.6.0-pre.core-crypto-0.6.0"

[patch.crates-io.jwt-simple]
git = "https://github.com/wireapp/rust-jwt-simple"
tag = "v0.11.3-pre.core-crypto-0.6.0"
rev = "15a69f82288d68b74a75c1364e5d4bf681f1c07b"
#tag = "v0.11.3-pre.core-crypto-0.6.0"

[patch.crates-io.rcgen]
git = "https://github.com/wireapp/rcgen"
tag = "v1.2.0-pre.core-crypto-0.6.0"
rev = "1e893c3444a9a1625dc8f3fe7be6df025f64646a"
#tag = "v1.2.0-pre.core-crypto-0.6.0"

[patch.crates-io.x509-parser]
git = "https://github.com/wireapp/x509-parser"
tag = "v1.0.2-pre.core-crypto-0.6.0"
rev = "4fbc4c795fc84537ba24eb91e563c9e80d3bd5d4"
#tag = "v1.0.2-pre.core-crypto-0.6.0"
Loading