Merging from trunk.

I hope I resolved the conflicts well (gmp and gccCross)


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

pkgs/tools/text/gnused/4.2.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "gnused-4.2";
+  name = "gnused-4.2.1";
   
   src = fetchurl {
-    url = "mirror://gnu/sed/sed-4.2.tar.bz2";
-    sha256 = "1j25icv75rnc0r1b9hv2164rcnnn7ba4zx5xrvp7v3h3mgimaxzf";
+    url = "mirror://gnu/sed/sed-4.2.1.tar.bz2";
+    sha256 = "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra";
   };
   
   doCheck = true;

pkgs/tools/text/qshowdiff/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt, perl}:
+
+stdenv.mkDerivation rec {
+  name = "qshowdiff-1.2";
+  
+  src = fetchurl {
+    url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
+    sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
+  };
+
+  buildInputs = [ qt perl ];
+
+  configurePhase = ''
+    ensureDir $out/{bin,man/man1}
+    makeFlags="PREFIX=$out"
+  '';
+
+  meta = {
+    homepage = http://qshowdiff.danfis.cz/;
+    description = "Colourful diff viewer";
+    license = "GPLv3+";
+  };
+}

pkgs/tools/text/wdiff/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "wdiff-0.5.95";
+  
+  src = fetchurl {
+    url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz";
+    sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97";
+  };
+  
+  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 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}