Skip to content

Commit

Permalink
build: bump rustler from 0.33.0 to 0.35.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored and SanjoDeundiak committed Nov 15, 2024
1 parent 4bf25b0 commit 8260029
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 41 deletions.
38 changes: 14 additions & 24 deletions Cargo.lock

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

3 changes: 1 addition & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ This file contains attributions for any 3rd-party open source code used in this
| indicatif | MIT | https://crates.io/crates/indicatif |
| indoc | MIT, Apache-2.0 | https://crates.io/crates/indoc |
| inout | MIT, Apache-2.0 | https://crates.io/crates/inout |
| inventory | MIT, Apache-2.0 | https://crates.io/crates/inventory |
| iovec | MIT, Apache-2.0 | https://crates.io/crates/iovec |
| ipnet | MIT, Apache-2.0 | https://crates.io/crates/ipnet |
| is-docker | MIT | https://crates.io/crates/is-docker |
Expand Down Expand Up @@ -443,7 +444,6 @@ This file contains attributions for any 3rd-party open source code used in this
| rustix | Apache-2.0 WITH LLVM-exception, Apache-2.0, MIT | https://crates.io/crates/rustix |
| rustler | MIT, Apache-2.0 | https://crates.io/crates/rustler |
| rustler_codegen | MIT, Apache-2.0 | https://crates.io/crates/rustler_codegen |
| rustler_sys | MIT, Apache-2.0 | https://crates.io/crates/rustler_sys |
| rustls | Apache-2.0, ISC, MIT | https://crates.io/crates/rustls |
| rustls-native-certs | Apache-2.0, ISC, MIT | https://crates.io/crates/rustls-native-certs |
| rustls-pemfile | Apache-2.0, ISC, MIT | https://crates.io/crates/rustls-pemfile |
Expand Down Expand Up @@ -579,7 +579,6 @@ This file contains attributions for any 3rd-party open source code used in this
| unicode-width | MIT, Apache-2.0 | https://crates.io/crates/unicode-width |
| unicode_categories | MIT, Apache-2.0 | https://crates.io/crates/unicode_categories |
| universal-hash | MIT, Apache-2.0 | https://crates.io/crates/universal-hash |
| unreachable | MIT, Apache-2.0 | https://crates.io/crates/unreachable |
| unsafe-libyaml | MIT | https://crates.io/crates/unsafe-libyaml |
| unsigned-varint | MIT | https://crates.io/crates/unsigned-varint |
| untrusted | ISC | https://crates.io/crates/untrusted |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ ockam_identity = { path = "../ockam_identity", default-features = false, feature
ockam_vault = { path = "../ockam_vault", default-features = false, features = ["std", "storage"], version = "^0.125.0" }
ockam_vault_aws = { path = "../ockam_vault_aws", version = "^0.51.0" }
# Enable credentials-sso feature in ockam_vault_aws for use on sso environments (like dev machines)
rustler = "=0.33.0"
rustler = "0.35.0"
time = "0.3.36"
tokio = "1.41.0"
15 changes: 1 addition & 14 deletions implementations/rust/ockam/ockam_rust_elixir_nifs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,17 +441,4 @@ fn import_signing_secret(secret: Binary) -> NifResult<String> {
})
}

rustler::init!(
"Elixir.OckamRustElixirNifs.Native",
[
create_identity,
attest_secure_channel_key,
verify_secure_channel_key_attestation,
check_identity,
issue_credential,
verify_credential,
import_signing_secret,
setup_aws_kms
],
load = load
);
rustler::init!("Elixir.OckamRustElixirNifs.Native", load = load);
4 changes: 4 additions & 0 deletions tools/nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
imports = [./parts/all.nix];
systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];

# see /tools/docker/builder/Dockerfile
# 24.1.7 stipulated by Dockerfile does not build successfully with current nixpkgs input
#ockam.elixir.erlangVersion = "26.2.3";
#ockam.elixir.version = "1.16.2";
ockam.rust.suggestedCargoPlugins = false;
ockam.rust.rustAnalyzer = false;
};
Expand Down

0 comments on commit 8260029

Please sign in to comment.