Merge commit 'cb21b77' into master.upstream

This is a partial merge of staging for builds which are working

pkgs/development/tools/misc/pkgconfig/default.nix

@@ -1,13 +1,13 @@
 {stdenv, fetchurl, automake, libiconv, vanilla ? false}:
 
 stdenv.mkDerivation (rec {
-  name = "pkg-config-0.28";
+  name = "pkg-config-0.29";
   
   setupHook = ./setup-hook.sh;
   
   src = fetchurl {
     url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb";
+    sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
   };
 
   buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;

pkgs/development/tools/misc/texinfo/6.0.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     installTargets="install install-tex";
   '';
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.isDarwin && !interactive;
 
   meta = {
     homepage = "http://www.gnu.org/software/texinfo/";