Merge branch 'master.upstream' into staging.post-15.06

2015-09-19 14:40:01 -07:00
parent 8b670fba26 a23b96c74d
commit 9f3c0d9967
95 changed files with 464061 additions and 6465 deletions
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, libtool, unstableVersion ? false
+, pkgconfig, runCommand, which, libtool
 }:

 # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.