Merge pull request #56406 from TomSmeets/emscripten-1_38_28

emscripten: 1.37.36 -> 1.38.28
This commit is contained in:
Matthew Bauer 2019-04-18 10:52:49 -04:00 committed by GitHub
commit f0cba0b3f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }:
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
let
defaultVersion = "45";
@ -6,7 +6,7 @@ let
# Map from git revs to SHA256 hashes
sha256s = {
"version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
"1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
inherit rev;
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake python ];
meta = with stdenv.lib; {
homepage = https://github.com/WebAssembly/binaryen;

View file

@ -12,9 +12,9 @@ stdenv.mkDerivation {
name = "emscripten-${rev}";
src = fetchFromGitHub {
owner = "kripken";
owner = "emscripten-core";
repo = "emscripten";
sha256 = "02p0cp86vd1mydlpq544xbydggpnrq9dhbxx7h08j235frjm5cdc";
sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq";
inherit rev;
};
@ -61,7 +61,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten;
homepage = https://github.com/emscripten-core/emscripten;
description = "An LLVM-to-JavaScript Compiler";
platforms = platforms.all;
maintainers = with maintainers; [ qknight matthewbauer ];

View file

@ -8,16 +8,16 @@ stdenv.mkDerivation rec {
name = "emscripten-fastcomp-${rev}";
src = fetchFromGitHub {
owner = "kripken";
owner = "emscripten-core";
repo = "emscripten-fastcomp";
sha256 = "04j698gmp686b5lricjakm5hyh2z2kh28m1ffkghmkyz4zkzmx98";
sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i";
inherit rev;
};
srcFL = fetchFromGitHub {
owner = "kripken";
owner = "emscripten-core";
repo = "emscripten-fastcomp-clang";
sha256 = "1ici51mmpgg80xk3y8f376nbbfak6rz27qdy98l8lxkrymklp5g5";
sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri";
inherit rev;
};
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten-fastcomp;
homepage = https://github.com/emscripten-core/emscripten-fastcomp;
description = "Emscripten LLVM";
platforms = platforms.all;
maintainers = with maintainers; [ qknight matthewbauer ];

View file

@ -2571,7 +2571,7 @@ in
cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
emscriptenVersion = "1.37.36";
emscriptenVersion = "1.38.28";
emscripten = callPackage ../development/compilers/emscripten { };