From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?QWzDrXJpbyBFeW5n?= Subject: [PATCH] fix python Date: Fri, 4 Apr 2014 08:42:28 +0000 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVzhn-0006uo-V7 for guix-devel@gnu.org; Fri, 04 Apr 2014 04:42:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVzhl-0004TG-O9 for guix-devel@gnu.org; Fri, 04 Apr 2014 04:42:31 -0400 Received: from mail-qc0-x242.google.com ([2607:f8b0:400d:c01::242]:54697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVzhl-0004TB-Iv for guix-devel@gnu.org; Fri, 04 Apr 2014 04:42:29 -0400 Received: by mail-qc0-f194.google.com with SMTP id i8so851341qcq.9 for ; Fri, 04 Apr 2014 01:42:28 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This fixes 'OSError: out of pty devices' with '# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set' >From 0757ec00fa23ed82b14e272b6329f6d89e2f5dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=C3=ADrio=20Eyng?= Date: Fri, 4 Apr 2014 08:28:02 +0000 Subject: [PATCH] gnu: python: Revert "gnu: Remove unused lambda arguments and prefer separate phases over augmented phases." * gnu/packages/python.scm (python): Revert commit d4bf49b140bd5cfb3580d2a038679160dc1331b5. --- gnu/packages/python.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bc56d7a..01de2f6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -139,17 +139,18 @@ (with-directory-excursion out (for-each (cut augment-rpath <> lib) (find-files "bin" ".*"))))) - (alist-cons-before - 'configure 'patch-lib-shells - (lambda _ - ;; Filter for existing files, since some may not exist in all - ;; versions of python that are built with this recipe. - (substitute* (filter file-exists? - '("Lib/subprocess.py" - "Lib/popen2.py" - "Lib/distutils/tests/test_spawn.py" - "Lib/test/test_subprocess.py")) - (("/bin/sh") (which "sh")))) + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure))) + (substitute* "Lib/subprocess.py" + (("args = \\[\"/bin/sh") + (string-append "args = [\"" (which "sh")))) + (substitute* + '("Lib/distutils/tests/test_spawn.py" + "Lib/test/test_subprocess.py") + (("/bin/sh") (which "sh"))) + (apply configure args))) (alist-cons-before 'check 'pre-check (lambda _ -- 1.8.4