mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge pull request #261438 from ereslibre/disable-cargo-audit-wasmtime
wasmtime: remove Cargo.toml patch due to cargo-auditable
This commit is contained in:
commit
1fb4ae1013
@ -12,13 +12,10 @@ rustPlatform.buildRustPackage rec {
|
|||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||||
|
auditable = false;
|
||||||
cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE=";
|
cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE=";
|
||||||
|
|
||||||
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
|
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" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -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
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user