From 5a06dd9ea80ec3c09970a7918be2696563557b33 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 29 Oct 2024 19:19:43 -0400 Subject: [PATCH] wasmer: 4.4.0 -> 5.0.0 Diff: https://github.com/wasmerio/wasmer/compare/refs/tags/v4.4.0...v5.0.0 --- .../interpreters/wasmer/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index f75b5bed48ca..c4b3f96123a0 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,22 +8,22 @@ , CoreFoundation , SystemConfiguration , Security -, withLLVM ? false -, withSinglepass ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) +, withLLVM ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) +, withSinglepass ? true }: rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.4.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zKo7d7LAfdGb7hC8RK7YH4lhk7RbivS+hNZDyQyHYM8="; + hash = "sha256-zTz4UK+A4HWf+XGaTh7FOUFEeB9JnZooFnxZ4K3AFGw="; }; - cargoHash = "sha256-tajvVMRfBHefU0kVro830HeJSdgJEKPmEQm7X0+4+Kc="; + cargoHash = "sha256-YSnGGd2uIxvhxDTJjtQMdv4Qx1DE7RA05Z+q4emJAKg="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; - env.LLVM_SYS_150_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; + env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; # Tests are failing due to `Cannot allocate memory` and other reasons doCheck = false; - meta = with lib; { + meta = { description = "Universal WebAssembly Runtime"; mainProgram = "wasmer"; longDescription = '' @@ -67,10 +67,8 @@ rustPlatform.buildRustPackage rec { x86 and ARM devices. ''; homepage = "https://wasmer.io/"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ]; - # error: multiple fields are never read - # --> lib/compiler-llvm/src/translator/intrinsics.rs:141:9 - broken = withLLVM; + license = lib.licenses.mit; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ Br1ght0ne shamilton nickcao ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a5d3b090784..ca066d999764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37875,7 +37875,7 @@ with pkgs; wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; wasmer = callPackage ../development/interpreters/wasmer { - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_18; inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; };