Merge remote-tracking branch 'upstream/staging' into master

pkgs/development/interpreters/guile/default.nix

@@ -55,7 +55,8 @@
   '';
 
   # make check doesn't work on darwin
-  doCheck = !stdenv.isDarwin;
+  # On i686-linux we got some error that doesn't always appear.
+  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
 
   setupHook = ./setup-hook-2.0.sh;
 

pkgs/development/interpreters/pixie/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc,
+{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc,
   pypy, libffi, libedit, libuv, boost, zlib,
   variant ? "jit", buildWithPypy ? false }:
 
@@ -36,7 +36,7 @@ let
     buildInputs = [ pkgconfig makeWrapper ];
     PYTHON = if buildWithPypy
       then "${pypy}/pypy-c/.pypy-c-wrapped"
-      else "${python}/bin/python";
+      else "${python2.interpreter}";
     unpackPhase = ''
       cp -R ${pixie-src} pixie-src
       mkdir pypy-src