bug#26802: Single source file emacs packages get a ".el.el" extension

[Arun Isaac <arunisaac@systemreboot.net>]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]


Single source file emacs packages (such as emacs-goto-chg,
emacs-transpose-frame, emacs-key-chord, etc.) get installed with a
double extension (".el.el"). This patch fixes that.


[-- Attachment #2: 0001-build-emacs-Don-t-append-an-extra-.el-to-source-file.patch --]
[-- Type: text/x-patch, Size: 1398 bytes --]

From 4796890f507a126edb6020573547d37815b3241e Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Sat, 6 May 2017 18:16:36 +0530
Subject: [PATCH] build: emacs: Don't append an extra ".el" to source file
 name.

* guix/build/emacs-build-system.scm (store-file->elisp-source-file): The
  source file name already has a ".el" suffix. Don't append an extra ".el".
---
 guix/build/emacs-build-system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index 44e8b0d31..3669b7d59 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,7 +51,7 @@ name that has been stripped of the hash and version number."
   (let-values (((name version)
                 (package-name->name+version
                  (strip-store-file-name file))))
-    (string-append name ".el")))
+    name))
 
 (define* (unpack #:key source #:allow-other-keys)
   "Unpack SOURCE into the build directory.  SOURCE may be a compressed
-- 
2.12.2