GNU Mailutils 2.2.

svn path=/nixpkgs/trunk/; revision=23713

2 files changed, 22 insertions, 7 deletions

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 262150e5174..43293b79578 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,20 +1,22 @@
 { fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
-, ncurses, gnutls, mysql, guile, texinfo, gnum4 }:
+, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu }:
 
 /* TODO: Add GNU SASL, GNU GSSAPI, and FreeBidi.  */
 
 stdenv.mkDerivation rec {
-  name = "mailutils-2.1";
+  name = "mailutils-2.2";
 
   src = fetchurl {
     url = "mirror://gnu/mailutils/${name}.tar.bz2";
-    sha256 = "09c4cb7w8z0gaxsqg1wgn2w8kgmqcqpahv7mw3ygw3nagcfh84cs";
+    sha256 = "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65";
   };
 
-  buildInputs = [
-    gettext gdbm libtool pam readline ncurses
-    gnutls mysql guile texinfo gnum4
-  ];
+  patches = [ ./path-to-cat.patch ];
+
+  buildInputs =
+   [ gettext gdbm libtool pam readline ncurses
+     gnutls mysql guile texinfo gnum4 ]
+   ++ stdenv.lib.optional doCheck dejagnu;
 
   doCheck = true;
 
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/pkgs/tools/networking/mailutils/path-to-cat.patch
new file mode 100644
index 00000000000..a9ae7c5366d
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/path-to-cat.patch
@@ -0,0 +1,13 @@
+Fix absolute path to `cat'.
+
+--- mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:39:58.000000000 +0200
++++ mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:40:00.000000000 +0200
+@@ -719,7 +719,7 @@ proc mu_test_file {args} {
+         set pattern [lrange $args 1 end]
+     }
+     
+-    set res [remote_spawn host "/bin/cat $filename"]
++    set res [remote_spawn host "cat $filename"]
+     if { $res < 0 || $res == "" } {
+ 	perror "Reading $filename failed."
+ 	return 1;