Merge branch 'origin/master' into stdenv-updates.

Conflicts:
	pkgs/tools/misc/less/default.nix

pkgs/tools/text/diffstat/default.nix

@@ -1,11 +1,11 @@
 {fetchurl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.45";
+  name = "diffstat-1.58";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/diffstat/"+ name +".tgz";
-    md5 = "cfe06ffcdbeaaa2fd296db867157ef78";
+    sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
   };
 
   meta = {

pkgs/tools/text/enscript/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "enscript-1.6.5.2";
+  name = "enscript-1.6.6";
 
   src = fetchurl {
     url = "mirror://gnu/enscript/${name}.tar.gz";
-    sha256 = "0xfblj3liwf1zxpx8bdcl2dwqi2lkfm1zsl6ld9757kgnfyk6gnv";
+    sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
   };
 
   buildInputs = [ gettext ];