Merge master into stdenv-updates

Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix

pkgs/tools/text/dos2unix/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation {
-  name = "dos2unix-5.3.1";
+  name = "dos2unix-6.0.3";
   
   src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-5.3.1.tar.gz;
-    sha256 = "0bwqw3wi0j4f1x8d39xw5v57ac0bc58j41vjx8v2qm1smg9jyci1";
+    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.3.tar.gz;
+    sha256 = "014sxyidqmjvc5xp5dmcimxd3apl8gyv6whc44vkb65151dqq9pm";
   };
 
   configurePhase = ''

pkgs/tools/text/enca/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libiconv ? null }:
+{ stdenv, fetchurl, libiconvOrNull, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-1.13";
+  name = "enca-1.15";
 
   src = fetchurl {
     url = "http://dl.cihar.com/enca/${name}.tar.bz2";
-    sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432";
+    sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv";
   };
 
-  buildInputs = (stdenv.lib.optional (libiconv != null) libiconv);
+  buildInputs = [ recode libiconvOrNull ];
 
   meta = {
     homepage = http://freecode.com/projects/enca;

pkgs/tools/text/highlight/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, getopt, lua, boost }:
         
 stdenv.mkDerivation rec {
-  name = "highlight-3.5";
+  name = "highlight-3.9";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "0jpidd2fwn5mbrgzjmh53qvfmqqp6g0mah7i5zsf9bd71ga1lp28";
+    sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
   };
 
   buildInputs = [ getopt lua boost ];

pkgs/tools/text/mairix/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "mairix-0.22";
+  name = "mairix-0.23";
 
   src = fetchurl {
     url = "mirror://sourceforge/mairix/${name}.tar.gz";
-    sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql";
+    sha256 = "1yzjpmsih6c60ks0d0ia153z9g35nj7dmk98383m0crw31dj6kl0";
   };
 
   buildInputs = [ zlib bzip2 bison flex ];

pkgs/tools/text/namazu/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "namazu-2.0.20";
+  name = "namazu-2.0.21";
 
   src = fetchurl {
     url = "http://namazu.org/stable/${name}.tar.gz";
-    sha256 = "1czw3l6wmz8887wfjpgds9di8hcg0hsmbc0mc6bkahj8g7lvrnyd";
+    sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w";
   };
 
   buildInputs = [ perl ];

pkgs/tools/text/numdiff/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
 let
-  version = "5.6.1";
+  version = "5.8.1";
 in
 stdenv.mkDerivation {
   name = "numdiff-${version}";
   src = fetchurl {
     url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
-    sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx";
+    sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr";
   };
   meta = {
     description = ''