From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49121)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fL7A5-0007Te-DV
	for guix-patches@gnu.org; Tue, 22 May 2018 09:17:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fL79y-0004Ks-Tq
	for guix-patches@gnu.org; Tue, 22 May 2018 09:17:09 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:35899)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fL79y-0004Ko-Pa
	for guix-patches@gnu.org; Tue, 22 May 2018 09:17:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fL79y-00026k-Fw
	for guix-patches@gnu.org; Tue, 22 May 2018 09:17:02 -0400
Subject: [bug#31490] [PATCH] gnu: Add emacs-cmake-mode.
Resent-Message-ID: <handler.31490.B31490.15269949768032@debbugs.gnu.org>
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
References: <20180518122716.9272-1-go.wigust@gmail.com>
	<462AD6C1-4912-4999-BDC9-3B3AE7C2D07F@gmail.com>
	<87in7gb5yq.fsf@gmail.com>
Date: Tue, 22 May 2018 09:16:06 -0400
In-Reply-To: <87in7gb5yq.fsf@gmail.com> (Oleg Pykhalov's message of "Tue, 22
	May 2018 08:43:41 +0300")
Message-ID: <87lgcbltk9.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Oleg Pykhalov <go.wigust@gmail.com>
Cc: 31490@debbugs.gnu.org

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> writes:

> Hello Maxim,
>
> Thank you for review.
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> On May 18, 2018 12:27:16 PM UTC, Oleg Pykhalov <go.wigust@gmail.com> wro=
te:
>>>* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
>>>---
>>> gnu/packages/cmake.scm | 17 +++++++++++++++++
>>> 1 file changed, 17 insertions(+)
>>>
>
> [=E2=80=A6]
>
>> Should we delete the Emacs mode files from our cmake package to not
>> have duplication in the store when installing both CMake and
>> emacs-cmake-mode?
>
> Sure, we should.  Could I push the following patch to core-updates?
>
> From 46cb6d48c7fd7712fca1d5619d02eba992b9182a Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Tue, 22 May 2018 07:41:45 +0300
> Subject: [PATCH] gnu: cmake: Delete Emacs library.
>
> * gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library.
> ---
>  gnu/packages/cmake.scm | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
> index e9fa86641..5f4a3c846 100644
> --- a/gnu/packages/cmake.scm
> +++ b/gnu/packages/cmake.scm
> @@ -85,6 +85,13 @@
>             " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\=
)$")))
>         #:phases
>         (modify-phases %standard-phases
> +         (add-after 'unpack 'split-package
> +           ;; Remove files that have been packaged in other package reci=
pes.
> +           (lambda _
> +             (delete-file "Auxiliary/cmake-mode.el")
> +             (substitute* "Auxiliary/CMakeLists.txt"
> +               (("install\\(FILES cmake-mode.el \
> +DESTINATION \\$\\{CMAKE_DATA_DIR\\}/editors/emacs\\)") ""))))

Nitpick: I'd use a regexp to match the text following cmake-mode.el on
the line to make it more resilient to any future changes. Otherwise this
LGTM :)

Maxim