nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

emacs-build-system: Fix 'package-name-version->elpa-name-version'. 

Fixes a regression introduced in b7c7c03eb5.

* 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.
This commit is contained in:
Mark H Weaver 2015-09-23 17:34:54 -04:00
parent bd90127ad4
commit a05c06720a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/build/emacs-build-system.scm
View File

@ -138,10 +138,9 @@ DIRS."
(define (package-name-version->elpa-name-version name-ver) (define (package-name-version->elpa-name-version name-ver)
"Convert the Guix package NAME-VER to the corresponding ELPA name-version "Convert the Guix package NAME-VER to the corresponding ELPA name-version
format. Essnetially drop the prefix used in Guix." format. Essnetially drop the prefix used in Guix."
(let ((name (strip-store-file-name name-ver))) (if (emacs-package? name-ver) ; checks for "emacs-" prefix
(if (emacs-package? name-ver) (string-drop name-ver (string-length "emacs-"))
(strip-store-file-name name-ver) name-ver))
name-ver)))
(define (store-directory->elpa-name-version store-dir) (define (store-directory->elpa-name-version store-dir)
"Given a store directory STORE-DIR return the part of the basename after the "Given a store directory STORE-DIR return the part of the basename after the