diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/wasmtime/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/interpreters/wasmtime/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index fafe521fbde1..b54a6478be02 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -1,31 +1,40 @@ -{ rustPlatform, fetchFromGitHub, Security, lib, stdenv }: +{ rustPlatform, rustfmt, fetchFromGitHub, Security, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20.0.2"; + version = "22.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-zXBVqSBq/dLY8oEs0dNZxtjs4H1aKTJYeeazysHvh3w="; + hash = "sha256-pVASjiGADtimXqnsit673v6nD77loN2nBphwgIMAvBA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-jFqLUWdW/UfOc843aWO7RNDx1E6sBhUWB5Xw2+A2u90="; + cargoHash = "sha256-s/+aKIu1V9iD8eTqHlHuhvC6oRDjX9IfI7tz3R1M5tw="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; buildInputs = lib.optional stdenv.isDarwin Security; - # SIMD tests are only executed on platforms that support all - # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): - # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 - doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support); - cargoTestFlags = ["--package" "wasmtime-runtime"]; + # rustfmt is brought into scope to fix the following + # warning: cranelift-codegen@0.108.0: + # Failed to run `rustfmt` on ISLE-generated code: Os + # { code: 2, kind: NotFound, message: "No such file or directory" } + nativeBuildInputs = [ rustfmt ]; + + doCheck = with stdenv.buildPlatform; + # SIMD tests are only executed on platforms that support all + # required processor features (e.g. SSE3, SSSE3 and SSE4.1 on x86_64): + # https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/cranelift/codegen/src/isa/x64/mod.rs#L220 + (isx86_64 -> sse3Support && ssse3Support && sse4_1Support) && + # The dependency `wasi-preview1-component-adapter` fails to build because of: + # error: linker `rust-lld` not found + !isAarch64; postInstall = '' # move libs from out to dev |