diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-18 10:52:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-18 10:52:49 -0400 |
commit | f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b (patch) | |
tree | b7bb623c07acdcd30b9731fe6727adedf259318c /pkgs/development/compilers | |
parent | 344b86f1f02946a47a4c027238ad015083c5826d (diff) | |
parent | 5ef3645a697d2433faac93f920f445bfe3e683d9 (diff) | |
download | nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar.gz nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar.bz2 nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar.lz nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar.xz nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.tar.zst nixlib-f0cba0b3f3c8a85d17009dad6fa16cdc4ab99a2b.zip |
Merge pull request #56406 from TomSmeets/emscripten-1_38_28
emscripten: 1.37.36 -> 1.38.28
Diffstat (limited to 'pkgs/development/compilers')
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index fc75fe92c730..48661ba407c9 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -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; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index e03039cb5e14..d0af770a2a49 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 06acebd2ba4a..91a42f53d282 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -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 ]; |