binaryen: 102 -> 105; emscripten: 3.0.0 -> 3.1.10 (#172741)

* binaryen: 102 -> 105

* emscripten: 3.0.0 -> 3.1.10

* Backport emscripten-core/emscripten#16986 to fix emscriptenPackages.libxml2 build

* Fix patch url/hash

Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>

Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>
This commit is contained in:
Faye Duxovni 2022-06-17 07:45:29 -04:00 committed by GitHub
parent 090a4593ab
commit 7b1e56acf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1567 additions and 1407 deletions

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "binaryen";
version = "102";
version = "105";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "binaryen";
rev = "version_${version}";
sha256 = "sha256-UlktpY9tyjYNkmiBZM42QGg67kcPo7VDy2B4Ty1YIew=";
sha256 = "0yg9rarjv1gfbq225cj9hnbgx99n5az2m19qwfp8z41dwhh71igm";
};
nativeBuildInputs = [ cmake python3 ];

View file

@ -3,11 +3,12 @@
, llvmPackages
, symlinkJoin, makeWrapper, substituteAll
, mkYarnModules
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "emscripten";
version = "3.0.0";
version = "3.1.10";
llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}";
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs=";
sha256 = "03k0pd5hna7khrnn3k3ln38h9w0vyaicfzvfqlqbxi4zz8jikrdb";
rev = version;
};
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
src = ./0001-emulate-clang-sysroot-include-logic.patch;
resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/";
})
(fetchpatch {
# https://github.com/emscripten-core/emscripten/pull/16986
url = "https://github.com/emscripten-core/emscripten/commit/d5ef6937fe395488e23a82c1e582a7ea5c2dab83.patch";
sha256 = "sha256-YX5DG8i5x6S7XnU58etEapDd+o5SuzbFIGv8v/9+T3E=";
})
];
buildPhase = ''

View file

@ -1,21 +1,21 @@
{
"name": "emscripten",
"version": "2.0.26",
"version": "3.1.10",
"private": true,
"devDependencies": {
"es-check": "^5.2.4",
"eslint": "^7.29.0",
"es-check": "^6.1.1",
"eslint": "^8.6.0",
"eslint-config-google": "^0.14.0",
"source-map": "0.5.7",
"ws": "~0.4.28"
"source-map": "0.7.3",
"ws": "^8.5.0"
},
"dependencies": {
"acorn": "8.4.1",
"google-closure-compiler": "20210601.0.0",
"html-minifier-terser": "5.1.1",
"acorn": "^8.7.0",
"google-closure-compiler": "20220104.0.0",
"html-minifier-terser": "6.1.0",
"wasm2c": "1.0.0"
},
"scripts": {
"lint": "eslint src/parseTools.js"
"lint": "eslint ."
}
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff