From de8c3feb7fbf00f7a2813e097128088fb8ac541d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Nov 2024 20:11:50 -0500 Subject: [PATCH] wasmer: 5.0.0 -> 5.0.1 Diff: https://github.com/wasmerio/wasmer/compare/refs/tags/v5.0.0...v5.0.1 --- .../interpreters/wasmer/default.nix | 48 +++++++++---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index c4b3f96123a0..46b687557920 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -1,29 +1,26 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, llvmPackages -, libffi -, libxml2 -, CoreFoundation -, SystemConfiguration -, Security -, withLLVM ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) -, withSinglepass ? true +{ + lib, + rustPlatform, + fetchFromGitHub, + llvmPackages, + libffi, + libxml2, + withLLVM ? true, + withSinglepass ? true, }: rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zTz4UK+A4HWf+XGaTh7FOUFEeB9JnZooFnxZ4K3AFGw="; + hash = "sha256-tfAGPBc36o5/XtVZ8IW6SFr+iWOkFzVTfe9jI4PpuA0="; }; - cargoHash = "sha256-YSnGGd2uIxvhxDTJjtQMdv4Qx1DE7RA05Z+q4emJAKg="; + cargoHash = "sha256-zvQJpAjZNfa54se2xaRPWCWoCWsWw1btaHYrWlyUIZY="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -33,10 +30,6 @@ rustPlatform.buildRustPackage rec { llvmPackages.llvm libffi libxml2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - SystemConfiguration - Security ]; # check references to `compiler_features` in Makefile on update @@ -46,11 +39,14 @@ rustPlatform.buildRustPackage rec { "static-artifact-create" "wasmer-artifact-load" "static-artifact-load" - ] - ++ lib.optional withLLVM "llvm" - ++ lib.optional withSinglepass "singlepass"; + ] ++ lib.optional withLLVM "llvm" ++ lib.optional withSinglepass "singlepass"; - cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; + cargoBuildFlags = [ + "--manifest-path" + "lib/cli/Cargo.toml" + "--bin" + "wasmer" + ]; env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; @@ -69,6 +65,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://wasmer.io/"; license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ Br1ght0ne shamilton nickcao ]; + maintainers = with lib.maintainers; [ + Br1ght0ne + shamilton + nickcao + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f32f5a321df0..9dbc1d49084f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37715,7 +37715,6 @@ with pkgs; wasmer = callPackage ../development/interpreters/wasmer { llvmPackages = llvmPackages_18; - inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; }; wavm = callPackage ../development/interpreters/wavm {