Unverified Commit 337b082d authored by Will Cohen's avatar Will Cohen Committed by GitHub
Browse files

emscripten: 3.1.64 -> 3.1.73 (#343743)

parents 16c61703 e255a909

pkgs/development/compilers/binaryen/default.nix

+56 −48
Original line number Diff line number Diff line 
{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten,

  gtest, lit, nodejs, filecheck

}:



let

  testsuite = fetchFromGitHub {

    owner = "WebAssembly";

    repo = "testsuite";

    rev = "e05365077e13a1d86ffe77acfb1a835b7aa78422";

    hash = "sha256-yvZ5AZTPUA6nsD3xpFC0VLthiu2CxVto66RTXBXXeJM=";

  };

in

  stdenv.mkDerivation rec {

    pname = "binaryen";

  version = "118";

    version = "119";



    src = fetchFromGitHub {

      owner = "WebAssembly";

      repo = "binaryen";

      rev = "version_${version}";

    hash = "sha256-akMW3S2/qUyLK8F77EtnaXPDXvIMpkGfNB2jOD6hQho=";

      hash = "sha256-JYXtN3CW4qm/nnjGRvv3GxQ0x9O9wHtNYQLqHIYTTOA=";

    };



    nativeBuildInputs = [ cmake python3 ];
@@ -18,6 +25,8 @@ stdenv.mkDerivation rec { 
    preConfigure = ''

      if [ $doCheck -eq 1 ]; then

        sed -i '/googletest/d' third_party/CMakeLists.txt

        rmdir test/spec/testsuite

        ln -s ${testsuite} test/spec/testsuite

      else

        cmakeFlagsArray=($cmakeFlagsArray -DBUILD_TESTS=0)

      fi
@@ -37,7 +46,7 @@ stdenv.mkDerivation rec { 
      # "binaryenjs" "binaryenjs_wasm" # not building this

      "lit" "gtest"

    ];

  doCheck = stdenv.hostPlatform.isLinux;

    doCheck = stdenv.isLinux;



    meta = with lib; {

      homepage = "https://github.com/WebAssembly/binaryen";
@@ -46,7 +55,6 @@ stdenv.mkDerivation rec { 
      maintainers = with maintainers; [ asppsa willcohen ];

      license = licenses.asl20;

    };



    passthru.tests = {

      inherit emscripten;

    };

pkgs/development/compilers/emscripten/default.nix

+6 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


stdenv.mkDerivation rec {

  pname = "emscripten";

  version = "3.1.64";

  version = "3.1.73";



  llvmEnv = symlinkJoin {

    name = "emscripten-llvm-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 
    name = "emscripten-node-modules-${version}";

    inherit pname version src;



    npmDepsHash = "sha256-2dsIuB6P+Z3wflIsn6QaZvjHeHHGzsFAI3GcP3SfiP4=";

    npmDepsHash = "sha256-bqxUlxpIH1IAx9RbnaMq4dZW8fy+M/Q02Q7VrW/AKNQ=";



    dontBuild = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "emscripten-core";

    repo = "emscripten";

    hash = "sha256-AbO1b4pxZ7I6n1dRzxhLC7DnXIUnaCK9SbLy96Qxqr0=";

    hash = "sha256-QlC2k2rhF3/Pz+knnrlBDV8AfHHBSlGr7b9Ae6TNsxY=";

    rev = version;

  };
@@ -51,6 +51,9 @@ stdenv.mkDerivation rec { 


    patchShebangs .



    # emscripten 3.1.67 requires LLVM tip-of-tree instead of LLVM 18

    sed -i -e "s/EXPECTED_LLVM_VERSION = 20/EXPECTED_LLVM_VERSION = 19/g" tools/shared.py



    # fixes cmake support

    sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py