From 5fccdbc079402eee345684bcbd1b1d0306cab1e8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 13:26:59 -0500 Subject: [PATCH] gnu: emacs-elpy: Fix build. Fixes , 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 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 4344520430..3c3dad73f2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9166,6 +9166,15 @@ (define-public emacs-elpy `(#: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