Merge remote-tracking branch 'origin/master' into hardened-stdenv

pkgs/development/web/grails/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out"

pkgs/development/web/nodejs/v0_10.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
+{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
 , pkgconfig, runCommand, which, libtool
 
 # apple frameworks
@@ -20,10 +20,10 @@ let
   })
   // ({ cares = c-ares; });
 
-  sharedConfigureFlags = name: [
+  sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [
     "--shared-${name}"
-    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
-    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
+    "--shared-${name}-includes=${lib.getDev drv}/include"
+    "--shared-${name}-libpath=${lib.getLib drv}/lib"
   ];
 
   inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;

pkgs/development/web/nodejs/v6.nix

@@ -4,9 +4,9 @@
 }@args:
 
 import ./nodejs.nix (args // rec {
-  version = "6.0.0";
+  version = "6.2.0";
   src = fetchurl {
     url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.gz";
-    sha256 = "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd";
+    sha256 = "1fcldsnkk6px5fms405j9z2yv6mmscin5x7sma8bdavqgn283zgw";
   };
 })