[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/12: build: emacs: Fix bug and improvement robustness.
From: |
Federico Beffa |
Subject: |
06/12: build: emacs: Fix bug and improvement robustness. |
Date: |
Sat, 01 Aug 2015 10:39:19 +0000 |
beffa pushed a commit to branch master
in repository guix.
commit 40aee1a133fd5163db543a224c1814eddb63087b
Author: Federico Beffa <address@hidden>
Date: Thu Jul 23 10:06:38 2015 +0200
build: emacs: Fix bug and improvement robustness.
* guix/build/emacs-build-system.scm (emacs-inputs): Fix matching pattern.
(patch-el-files): Improve regexp pattern.
---
guix/build/emacs-build-system.scm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build/emacs-build-system.scm
b/guix/build/emacs-build-system.scm
index dd3cfc4..f18db0a 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -59,7 +59,7 @@ store in '.el' files."
(el-dir (string-append out %install-suffix "/" elpa-name-ver))
(substitute-cmd (lambda ()
(substitute* (find-files "." "\\.el$")
- (("\"/bin/(.*)\"" _ cmd)
+ (("\"/bin/([^.].*)\"" _ cmd)
(string-append "\"" (which cmd) "\""))))))
(with-directory-excursion el-dir
;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still encoded
@@ -114,7 +114,7 @@ store in '.el' files."
(define (emacs-inputs inputs)
"Retrieve the list of Emacs packages from INPUTS."
(filter (match-lambda
- ((label directory)
+ ((label . directory)
(emacs-package? ((compose package-name->name+version
store-directory->name-version)
directory)))
- branch master updated (8fd857f -> 48dbeef), Federico Beffa, 2015/08/01
- 03/12: import: elpa: Improve error message reporting., Federico Beffa, 2015/08/01
- 05/12: gnu: Add emacs-s., Federico Beffa, 2015/08/01
- 01/12: gnu: Add fastcap., Federico Beffa, 2015/08/01
- 04/12: gnu: Add emacs-dash., Federico Beffa, 2015/08/01
- 06/12: build: emacs: Fix bug and improvement robustness.,
Federico Beffa <=
- 02/12: gnu: Add fasthenry., Federico Beffa, 2015/08/01
- 08/12: gnu: Add python-mistune., Federico Beffa, 2015/08/01
- 07/12: gnu: Add emacs-f., Federico Beffa, 2015/08/01
- 09/12: gnu: Add python-ptyprocess., Federico Beffa, 2015/08/01
- 12/12: gnu: Add emacs-ob-ipython., Federico Beffa, 2015/08/01
- 10/12: gnu: Add python-terminado., Federico Beffa, 2015/08/01
- 11/12: gnu: python-ipython: Update to 3.2.1., Federico Beffa, 2015/08/01