diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/development/interpreters/wasmtime | |
parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/wasmtime')
2 files changed, 30 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 936caafaffa7..9bc8523d7d4a 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -15,6 +15,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; 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/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch new file mode 100644 index 000000000000..03870600e32a --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch @@ -0,0 +1,26 @@ +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 + |