[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/15: emacs-build-system: Fix 'package-name-version->elpa-name-version'
From: |
Mark H. Weaver |
Subject: |
15/15: emacs-build-system: Fix 'package-name-version->elpa-name-version'. |
Date: |
Wed, 23 Sep 2015 21:39:20 +0000 |
mhw pushed a commit to branch mhw-core-updates
in repository guix.
commit eee402106a9aefad050abf475b388a8189299f04
Author: Mark H Weaver <address@hidden>
Date: Wed Sep 23 17:34:54 2015 -0400
emacs-build-system: Fix 'package-name-version->elpa-name-version'.
Fixes a regression introduced in b7c7c03eb5e37fc3455e4e17b0898ffc4bca29c3.
* guix/build/emacs-build-system.scm
(package-name-version->elpa-name-version):
Remove unused 'name' binding. Do not abuse 'strip-store-file-name' to
remove the "emacs-" prefix, which worked before b7c7c03eb5 but not after.
---
guix/build/emacs-build-system.scm | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/guix/build/emacs-build-system.scm
b/guix/build/emacs-build-system.scm
index cb5bde3..f0a9a6e 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -138,10 +138,9 @@ DIRS."
(define (package-name-version->elpa-name-version name-ver)
"Convert the Guix package NAME-VER to the corresponding ELPA name-version
format. Essnetially drop the prefix used in Guix."
- (let ((name (strip-store-file-name name-ver)))
- (if (emacs-package? name-ver)
- (strip-store-file-name name-ver)
- name-ver)))
+ (if (emacs-package? name-ver) ; checks for "emacs-" prefix
+ (string-drop name-ver (string-length "emacs-"))
+ name-ver))
(define (store-directory->elpa-name-version store-dir)
"Given a store directory STORE-DIR return the part of the basename after the
- 05/15: gnu: linux-libre: Add case for ARCH=mips., (continued)
- 05/15: gnu: linux-libre: Add case for ARCH=mips., Mark H. Weaver, 2015/09/23
- 06/15: gnu: linux-libre: On MIPS, the linux image name is vmlinuz, not bzImage., Mark H. Weaver, 2015/09/23
- 04/15: gnu: linux-libre: Add 'supported-systems' field: Intel only for now., Mark H. Weaver, 2015/09/23
- 09/15: gnu: grub: Install documentation., Mark H. Weaver, 2015/09/23
- 08/15: gnu: grub: Use modify-phases and other minor cleanups., Mark H. Weaver, 2015/09/23
- 10/15: gnu: grub: Update to 2.02-beta2-502-gc93d3e6., Mark H. Weaver, 2015/09/23
- 13/15: PRELIMINARY: system: grub: Convert grub background using rsvg-convert, not inkscape., Mark H. Weaver, 2015/09/23
- 12/15: LOCAL_ONLY: gnu: lm-sensors: Remove gnuplot input., Mark H. Weaver, 2015/09/23
- 11/15: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2015/09/23
- 14/15: NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel., Mark H. Weaver, 2015/09/23
- 15/15: emacs-build-system: Fix 'package-name-version->elpa-name-version'.,
Mark H. Weaver <=
- 07/15: gnu: Add linux-libre-loongson2f., Mark H. Weaver, 2015/09/23