Merge pull request #238979 from NickCao/wasm-pack

wasm-pack: 0.11.1 -> 0.12.0
This commit is contained in:
Nick Cao 2023-06-26 22:09:02 +08:00 committed by GitHub
commit c520a82a75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 24 deletions

View file

@ -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.

View file

@ -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 { };