diff options
| author | Rafael Fernández López <ereslibre@ereslibre.es> | 2023-10-16 18:20:51 +0200 |
|---|---|---|
| committer | Rafael Fernández López <ereslibre@ereslibre.es> | 2023-10-16 18:22:30 +0200 |
| commit | c3aabc31df2dc7713ca17b023c372589d0b92b4d (patch) | |
| tree | d53c4bfd3f4dc45976eb328adb0997ad754e6285 /pkgs/development/interpreters/wasmtime | |
| parent | 81cec3f625561843a92ec0002e369ba95ef6a764 (diff) | |
wasmtime: remove Cargo.toml patch due to cargo-auditable
Diffstat (limited to 'pkgs/development/interpreters/wasmtime')
| -rw-r--r-- | pkgs/development/interpreters/wasmtime/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch | 26 |
2 files changed, 2 insertions, 31 deletions
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 408830aa91561..f9202514f800e 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,13 +12,10 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. + auditable = false; cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE="; - cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; - cargoPatches = [ - # this patch is necessary until cargo-auditable is bumped on the rust platform - ./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch - ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch b/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch deleted file mode 100644 index 03870600e32ae..0000000000000 --- a/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= - <ereslibre@ereslibre.es> -Date: Mon, 4 Sep 2023 15:25:15 +0200 -Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation - -`cargo-auditable` fails to process the current `Cargo.toml` as it -is (cargo/rustc 1.72.0 is able to process this crate without any -issues). ---- - crates/c-api/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml -index a464c0dbd..1e793432c 100644 ---- a/crates/c-api/Cargo.toml -+++ b/crates/c-api/Cargo.toml -@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation'] - jitdump = ["wasmtime/jitdump"] - cache = ["wasmtime/cache"] - parallel-compilation = ['wasmtime/parallel-compilation'] --wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common'] -+wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common'] --- -2.40.1 - |