summaryrefslogtreecommitdiffstats
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorJoachim Schiele <js@lastlog.de>2016-05-25 12:24:33 +0200
committerJoachim Schiele <js@lastlog.de>2016-05-25 12:24:33 +0200
commit5f42ed51254b9ed7944114f481bebdb9d9954189 (patch)
treeeeddcaa991883fcb3b0b9ae2d10681bba699b5d3 /pkgs/development/compilers
parent1908c90412b25fb40e52f4ac0a3b5ee778f4b70a (diff)
parent4d261909b988e8d7f649a8657cb3794ff6d9b27e (diff)
Merge pull request #15684 from qknight/emscripten_1.36.4
emscripten: revision bump from 1.35.4 to 1.36.4, was tested with comp…
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/emscripten-fastcomp/default.nix8
-rw-r--r--pkgs/development/compilers/emscripten/default.nix8
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 330fa2a7939f..c33c3992e007 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, python }:
let
- tag = "1.35.4";
+ tag = "1.36.4";
in
stdenv.mkDerivation rec {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
srcFC = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp;
rev = "refs/tags/${tag}";
- sha256 = "3bd50787d78381f684f9b3f46fc91cc3d1803c3389e19ec41ee59c2deaf727d8";
+ sha256 = "0qmrc83yrlmlb11gqixxnwychif964054lgdiycz0l10yj0q37j5";
};
srcFL = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp-clang;
rev = "refs/tags/${tag}";
- sha256 = "ec0d22c04eec5f84695401e19a52704b28e8d2779b87388f399b5f63b54a9862";
+ sha256 = "1av58y9s24l32hsdgp3jh4fkc5005xbzzjd27in2r9q3p6igd5d4";
};
buildInputs = [ python ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten-fastcomp;
description = "emscripten llvm";
platforms = platforms.all;
- maintainers = with maintainers; [ bosu ];
+ maintainers = with maintainers; [ qknight ];
license = stdenv.lib.licenses.ncsa;
};
}
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 0264c9d36d9b..456443ba0dd0 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let
- tag = "1.35.4";
+ tag = "1.36.4";
appdir = "share/emscripten";
in
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = git://github.com/kripken/emscripten;
rev = "refs/tags/${tag}";
- sha256 = "466500356c8c0fbcee495b2dbd2ccf0bf9d7eaf303d274ebaf491122759dd233";
+ sha256 = "02m85xh9qx29kb6v11y072gk8fvyc23964wclr70c69j2gal2qpr";
};
- buildCommand = ''
+ buildCommand = ''
mkdir -p $out/${appdir}
cp -r $src/* $out/${appdir}
chmod -R +w $out/${appdir}
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kripken/emscripten;
description = "An LLVM-to-JavaScript Compiler";
platforms = platforms.all;
- maintainers = with maintainers; [ bosu ];
+ maintainers = with maintainers; [ qknight ];
license = licenses.ncsa;
};
}