public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/binaryen/default.nix
View File

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

6
pkgs/development/compilers/emscripten/default.nix
View File

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

10
pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

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