From 340f826442c846389d3e3ddce689204db1cce864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 10 May 2010 14:30:44 +0000
Subject: [PATCH] GNU Wdiff 0.6.1.

svn path=/nixpkgs/trunk/; revision=21708
---
 pkgs/tools/text/wdiff/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index da1ff92add3..fd3d4f94769 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/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";
+    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;
   };
 }