From 7b395420a05c6dd3c20791f9f1314cc99f6394af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 11 Mar 2011 19:45:51 +0000
Subject: [PATCH] GNU DejaGNU 1.5.

svn path=/nixpkgs/trunk/; revision=26285
---
 .../tools/misc/dejagnu/default.nix            | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index fec825627eaf..06c1d4fe76ba 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,40 +1,40 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.4.4";
+  name = "dejagnu-1.5";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "13841q6pfwd9d1sdw48yxdyb4xhiccii0mb0ilql627v43pyvyyh";
+    sha256 = "1nx3x3h96a82q92q108q71giv2nz9xmbbn2nrlr3wvvs6l45id68";
   };
 
   patches = [ ./wrapped-runtest-program-name.patch ];
 
   buildInputs = [ expect makeWrapper ];
 
-  # FIXME: Enable when the "spawn id" problem is fixed.
-  doCheck = false;
+  doCheck = true;
 
-  # Note: The test-suite *requires* /dev/pts among the
-  # `build-chroot-dirs' of the build daemon when building in a chroot.
+  # Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
+  # the build daemon when building in a chroot.  See
+  # <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
+  # details.
 
-  # FIXME: The test-suite currently fails with this problem:
+  # The test-suite needs to have a non-empty stdin:
   #   http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html
-  #   http://thread.gmane.org/gmane.linux.distributions.nixos/1036
   checkPhase = ''
     # Provide `runtest' with a log name, otherwise it tries to run
     # `whoami', which fails when in a chroot.
-    LOGNAME="nix-build-daemon" make check
+    LOGNAME="nix-build-daemon" make check < /dev/zero
   '';
 
   postInstall = ''
     wrapProgram "$out/bin/runtest" \
-                --prefix PATH ":" "${expect}/bin"
+		--prefix PATH ":" "${expect}/bin"
   '';
 
   meta = {
     description = "The DejaGNU testing framework";
-    
+
     longDescription = ''
       DejaGnu is a framework for testing other programs.  Its purpose
       is to provide a single front end for all tests.  Think of it as a
@@ -48,5 +48,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/dejagnu/;
     license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }