Merge branch 'staging-next'

Security fixes for a few packages are included.

pkgs/tools/text/kakasi/default.nix

@@ -21,4 +21,14 @@ stdenv.mkDerivation rec {
     url = "http://kakasi.namazu.org/stable/${name}.tar.xz";
     sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f";
   };
+
+  postPatch = ''
+    for a in tests/kakasi-* ; do
+      substituteInPlace $a \
+        --replace "/bin/echo" echo
+    done
+  '';
+
+  doCheck = false; # fails 1 of 6 tests
+
 }

pkgs/tools/text/recode/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/Makefile.am --replace "ansi2knr" ""
   '';
 
-  #doCheck = true; # doesn't work yet
+  doCheck = false; # fails 10 out of 16 tests
 
   preCheck = ''
     checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")

pkgs/tools/text/wdiff/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo }:
+{ stdenv, fetchurl, texinfo, which }:
 
 stdenv.mkDerivation rec {
   name = "wdiff-1.2.2";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ texinfo ];
 
+  checkInputs = [ which ];
+
   meta = {
     homepage = http://www.gnu.org/software/wdiff/;
     description = "Comparing files on a word by word basis";