Merging from trunk (conflict on glibc, I think I resolved it)

svn path=/nixpkgs/branches/stdenv-updates/; revision=21879

pkgs/tools/text/catdoc/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "catdoc-0.94.2";
+  src = fetchurl {
+    url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz";
+    sha256 = "0qnk8fw3wc40qa34yqz51g0knif2jd78a4717nvd3rb46q88pj83";
+  };
+
+  configureFlags = "--disable-wordview";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.all;
+    license = "GPL2";
+    maintainers = [ maintainers.urkud ];
+  };
+}

pkgs/tools/text/source-highlight/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, boost }:
+
+let
+  name = "source-highlight";
+  version = "3.1.3";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+      url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
+      sha256 = "2d819f2ffdc8bb23a87635bdfbc51545db22605a8e544f66f86054b8075af0b5";
+    };
+
+  buildInputs = [boost];
+  doCheck = false;		# The test suite fails with a trivial
+				# error, so I'll disable it for now.
+				# Whoever bumps this build to the next
+				# version, please re-enable it though!
+
+  meta = {
+    description = "render source code with syntax highlighting";
+    homepage = "http://www.gnu.org/software/src-highlite/";
+    license = "GPLv3+";
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
+    longDescription =
+      ''
+        GNU Source-highlight, given a source file, produces a document
+        with syntax highlighting.
+      '';
+  };
+}

pkgs/tools/text/wdiff/default.nix

@@ -1,18 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-0.5.95";
-  
+  name = "wdiff-0.6.1";
+
   src = fetchurl {
-    url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz";
-    sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97";
+    url = "mirror://gnu/wdiff/${name}.tar.gz";
+    sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf";
   };
-  
+
+  doCheck = true;
+
   meta = {
     homepage = http://www.gnu.org/software/wdiff/;
-    description = "A front-end to diff for comparing files on a word per word basis";
-    license = "GPLv3";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    description = "GNU wdiff, comparing files on a word by word basis";
+    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
 }