diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 060b75ed2914..770a1232196a 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,36 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform -, pkg-config -, libressl -, curl -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; - rev = "v${version}"; - sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Sfcf/Dko2lAfkfYdeanLAqhbUgeKtGBxx4timZi2kCk="; }; - cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU="; + cargoHash = "sha256-bl1KDFNvpNtkbKqiBRbmQLo1/oqLl7u7gNHLhhm8ETI="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - # LibreSSL works around segfault issues caused by OpenSSL being unable to - # gracefully exit while doing work. - # See: https://github.com/rustwasm/wasm-pack/issues/650 - libressl - ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2d1ef35c125..c223cc11dfdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40338,10 +40338,7 @@ with pkgs; yabasic = callPackage ../development/interpreters/yabasic { }; - wasm-pack = callPackage ../development/tools/wasm-pack { - inherit (darwin.apple_sdk.frameworks) Security; - libressl = libressl_3_6; - }; + wasm-pack = callPackage ../development/tools/wasm-pack { }; wasynth = callPackage ../development/tools/wasynth { };