Author: ludo
Date: Fri Sep 10 11:50:11 2010
New Revision: 23713
URL: https://svn.nixos.org/websvn/nix/?rev=23713&sc=1
Log:
GNU Mailutils 2.2.
Added:
nixpkgs/trunk/pkgs/tools/networking/mailutils/path-to-cat.patch
Modified:
nixpkgs/trunk/pkgs/tools/networking/mailutils/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/mailutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/mailutils/default.nix Fri Sep 10
11:50:06 2010 (r23712)
+++ nixpkgs/trunk/pkgs/tools/networking/mailutils/default.nix Fri Sep 10
11:50:11 2010 (r23713)
@@ -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;
Added: nixpkgs/trunk/pkgs/tools/networking/mailutils/path-to-cat.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/mailutils/path-to-cat.patch Fri Sep
10 11:50:11 2010 (r23713)
@@ -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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
