unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Alírio Eyng" <alirioeyng@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH] fix python
Date: Fri, 4 Apr 2014 08:42:28 +0000	[thread overview]
Message-ID: <CALkz57GHZ81J5o800PWFdBpb2he_7V6aRwgrThOE=zWJwZsusA@mail.gmail.com> (raw)

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?= <alirioeyng@gmail.com>
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

             reply	other threads:[~2014-04-04  8:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-04  8:42 Alírio Eyng [this message]
2014-04-04 15:36 ` [PATCH] fix python Eric Bavier
2014-04-04 19:36   ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CALkz57GHZ81J5o800PWFdBpb2he_7V6aRwgrThOE=zWJwZsusA@mail.gmail.com' \
    --to=alirioeyng@gmail.com \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).