[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: emacs-elpy: Fix build.
From: |
guix-commits |
Subject: |
branch master updated: gnu: emacs-elpy: Fix build. |
Date: |
Thu, 18 Feb 2021 15:38:39 -0500 |
This is an automated email from the git hooks/post-receive script.
apteryx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 5fccdbc gnu: emacs-elpy: Fix build.
5fccdbc is described below
commit 5fccdbc079402eee345684bcbd1b1d0306cab1e8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Feb 18 13:26:59 2021 -0500
gnu: emacs-elpy: Fix build.
Fixes <https://issues.guix.gnu.org/46516>, which was caused by commit
41abf3b3a0fabe06817f3940cba778974ce79c46.
* gnu/packages/emacs-xyz.scm (emacs-elpy)[phases]
{patch-ffip-project-search-call}: New phase.
Reported-by: Simon Streit <simon@netpanic.org> and others.
---
gnu/packages/emacs-xyz.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4344520..3c3dad7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9166,6 +9166,15 @@ indentation guides in Emacs:
`(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include)
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-ffip-project-search-call
+ (lambda _
+ ;; Since version 6.0.0 of find-file-in-project,
+ ;; ffip-project-search doesn't accept a third argument anymore
+ ;; (see: https://github.com/jorgenschaefer/elpy/issues/1889).
+ (substitute* "elpy.el"
+ (("\\((ffip-project-search nil nil) project-root\\)" _
signature)
+ (format #f "(let ((ffip-project-root project-root)) (~a))"
+ signature)))))
;; The default environment of the RPC uses Virtualenv to install
;; Python dependencies from PyPI. We don't want/need this in Guix.
(add-before 'check 'do-not-use-virtualenv
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: emacs-elpy: Fix build.,
guix-commits <=