From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6zCs-00079H-72 for guix-patches@gnu.org; Sat, 06 May 2017 08:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6zCo-0005gR-7m for guix-patches@gnu.org; Sat, 06 May 2017 08:53:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6zCo-0005gN-3x for guix-patches@gnu.org; Sat, 06 May 2017 08:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d6zCn-0006gx-Oc for guix-patches@gnu.org; Sat, 06 May 2017 08:53:01 -0400 Subject: bug#26802: Single source file emacs packages get a ".el.el" extension Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <05a79dd0.AEAAJ6TpV0QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZDccC@bnc3.mailjet.com>) id 1d6zCD-00078X-EH for guix-patches@gnu.org; Sat, 06 May 2017 08:52:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <05a79dd0.AEAAJ6TpV0QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZDccC@bnc3.mailjet.com>) id 1d6zC9-0005Cu-I5 for guix-patches@gnu.org; Sat, 06 May 2017 08:52:25 -0400 Received: from o108.p9.mailjet.com ([87.253.234.108]:47580) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <05a79dd0.AEAAJ6TpV0QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZDccC@bnc3.mailjet.com>) id 1d6zC9-0005BE-7u for guix-patches@gnu.org; Sat, 06 May 2017 08:52:21 -0400 Message-Id: <05a79dd0.AEAAJ6TpV0QAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABZDccC@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Sat, 06 May 2017 18:21:56 +0530 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26802@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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. = --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-build-emacs-Don-t-append-an-extra-.el-to-source-file.patch Content-Transfer-Encoding: quoted-printable >From 4796890f507a126edb6020573547d37815b3241e Mon Sep 17 00:00:00 2001 From: Arun Isaac 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-s= ystem.scm index 44e8b0d31..3669b7d59 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2015 Federico Beffa ;;; Copyright =C2=A9 2016 David Thompson ;;; Copyright =C2=A9 2016 Alex Kost +;;; Copyright =C2=A9 2017 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,7 @@ name that has been stripped of the hash and version num= ber." (let-values (((name version) (package-name->name+version (strip-store-file-name file)))) - (string-append name ".el"))) + name)) =20 (define* (unpack #:key source #:allow-other-keys) "Unpack SOURCE into the build directory. SOURCE may be a compressed --=20 2.12.2 --=-=-=--