From 4a01ba47ee010b27ae970c7d2c60ebf16b5878df Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 22 May 2023 17:51:14 +0200 Subject: [PATCH] wasmtime: 8.0.1 -> 9.0.0 https://github.com/bytecodealliance/wasmtime/blob/v9.0.0/RELEASES.md --- .../interpreters/wasmtime/default.nix | 16 +++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 16abba6087d0..51414afed748 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,27 +1,29 @@ -{ rustPlatform, fetchFromGitHub, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, Security, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "8.0.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-xSHwR2MGL49VDKjzAh+xYHbLz3FFg3KYVBjALVgKSQI="; + hash = "sha256-9ga7BKJoaw7naX8t4o+zNnWkjIvSII5oVRM0dYMrseo="; fetchSubmodules = true; }; - cargoHash = "sha256-A2JhjRFKPltHubiJYHBXj2H4cdU43Y2x6UjEpRGPX7U="; + cargoHash = "sha256-GkL78aAIGdSlcxeRTIVp1jcXIg1ZtvB2LNIoPEViNcs="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + # SIMD tests are only executed on platforms that support all - # required processor features (e.g. SSE3, SSSE3, SSE4.1 and SSE4.2 on x86_64): - # https://github.com/bytecodealliance/wasmtime/blob/207cd1ce15ecc504dafaec490c5eae801cac4691/cranelift/codegen/src/isa/x64/mod.rs#L228 - doCheck = with stdenv.buildPlatform; (isx86_64 -> sse3Support && ssse3Support && sse4_1Support && sse4_2Support); + # 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"]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e5c5061df41..75a91ef47769 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40352,7 +40352,9 @@ with pkgs; omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; - wasmtime = callPackage ../development/interpreters/wasmtime { }; + wasmtime = callPackage ../development/interpreters/wasmtime { + inherit (darwin.apple_sdk.frameworks) Security; + }; wfuzz = with python3Packages; toPythonApplication wfuzz;