From 8e0c39c2852b8e2ed61289e98adcd94e51a8477f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Jul 2009 21:41:36 +0000
Subject: [PATCH] GNU Guile 1.8.7.

svn path=/nixpkgs/trunk/; revision=16181
---
 .../interpreters/guile/default.nix            |  8 ++--
 .../interpreters/guile/popen-zombie.patch     | 45 -------------------
 2 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/interpreters/guile/popen-zombie.patch

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index ed542f283c0..7e2de8c942e 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -2,14 +2,12 @@
 , gawk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "guile-1.8.6";
+  name = "guile-1.8.7";
   src = fetchurl {
     url = "mirror://gnu/guile/" + name + ".tar.gz";
-    sha256 = "11hxk8hyibbvjlk3zyf8vnl0xm0kvhmymj643inpbzw02i4zk8k9";
+    sha256 = "1czhcrn6l63xhsw3fjmv88djflqxbdpxjhgmwwvscm8rv4wn7vmz";
   };
 
-  patches = [ ./popen-zombie.patch ];
-
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = [readline libtool gmp gawk];
 
@@ -35,5 +33,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/guile/;
     license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/development/interpreters/guile/popen-zombie.patch b/pkgs/development/interpreters/guile/popen-zombie.patch
deleted file mode 100644
index 215c87a3a7b..00000000000
--- a/pkgs/development/interpreters/guile/popen-zombie.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: guile/test-suite/tests/popen.test
-===================================================================
-RCS file: /sources/guile/guile/guile-core/guile/test-suite/tests/popen.test,v
-retrieving revision 1.3.2.2
-diff -u -r1.3.2.2 popen.test
---- guile/test-suite/tests/popen.test	25 Aug 2006 01:21:39 -0000	1.3.2.2
-+++ guile/test-suite/tests/popen.test	18 Mar 2008 20:18:08 -0000
-@@ -1,6 +1,6 @@
- ;;;; popen.test --- exercise ice-9/popen.scm      -*- scheme -*-
- ;;;;
--;;;; Copyright 2003, 2006 Free Software Foundation, Inc.
-+;;;; Copyright 2003, 2006, 2008 Free Software Foundation, Inc.
- ;;;;
- ;;;; This library is free software; you can redistribute it and/or
- ;;;; modify it under the terms of the GNU Lesser General Public
-@@ -81,12 +81,15 @@
-     (let* ((pair (pipe))
- 	   (port (with-error-to-port (cdr pair)
- 		   (lambda ()
--		     (open-input-pipe
--		      "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
-+		     (open-input-output-pipe
-+		      "exec 1>/dev/null; echo closed 1>&2; exec 2>/dev/null; read")))))
-       (close-port (cdr pair))   ;; write side
--      (and (char? (read-char (car pair))) ;; wait for child to do its thing
--	   (char-ready? port)
--	   (eof-object? (read-char port))))))
-+      (let ((result (and (char? (read-char (car pair))) ;; wait for child to do its thing
-+			 (char-ready? port)
-+			 (eof-object? (read-char port)))))
-+	(display "hello!\n" port)
-+	(close-pipe port)
-+	result))))
- 
- ;;
- ;; open-output-pipe
-@@ -132,7 +135,7 @@
- 	      (port (with-error-to-port (cdr pair)
- 		      (lambda ()
- 			(open-output-pipe
--			 "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; sleep 999")))))
-+			 "exec 0</dev/null; echo closed 1>&2; exec 2>/dev/null; read")))))
- 	 (close-port (cdr pair))   ;; write side
- 	 (and (char? (read-char (car pair))) ;; wait for child to do its thing
- 	      (catch 'system-error