Merging from trunk.

I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


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

3 files changed, 14 insertions, 16 deletions

diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix
index 2111a2b8dc1..6dab8f86c32 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/pkgs/tools/text/multitran/libfacet/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl, libmtsupport} :
+{ stdenv, fetchurl, libmtsupport }:
 
 stdenv.mkDerivation {
   name = "libfacet-0.0.1alpha2";
+  
   src = fetchurl {
     url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2;
     sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144";
@@ -15,7 +16,6 @@ stdenv.mkDerivation {
       src/Makefile;
   '';
 
-
   meta = {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: enchanced locale facets";
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index b89ffb850a0..0ab73142ea0 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,21 +1,19 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "patchutils-0.3.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2;
     sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "collection of programs that operate on patch files, fix"
-        + " diffs after manually editing them, create a diff of diffs etc";
-      homepage = http://cyberelk.net/tim/software/patchutils;
-      license = "GPLv2";
-      executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
-        "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
-        "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
+    description = "Tools to manipulate patch files";
+    homepage = http://cyberelk.net/tim/software/patchutils;
+    license = "GPLv2";
+    executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
+      "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
+      "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
   };
 }
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index 7ae7241c40b..760ab077012 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-0.6.1";
+  name = "wdiff-0.6.3";
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf";
+    sha256 = "04x0snfyahw9si160zwghh5nmijn535iacbbfsd376w4p0k5zk08";
   };
 
   doCheck = true;