From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53156)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e3zpi-0001jL-RZ
	for guix-patches@gnu.org; Mon, 16 Oct 2017 03:29:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e3zpe-0001Mi-J4
	for guix-patches@gnu.org; Mon, 16 Oct 2017 03:29:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:33695)
	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 1e3zpe-0001Me-Fs
	for guix-patches@gnu.org; Mon, 16 Oct 2017 03:29:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e3zpe-0007Ws-9R
	for guix-patches@gnu.org; Mon, 16 Oct 2017 03:29:02 -0400
Subject: [bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib.
Resent-Message-ID: <handler.28805.B28805.150813888228857@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20171013054542.2032-1-mail@cbaines.net> <87shemybat.fsf@gnu.org>
	<20171015200517.253789a0@cbaines.net> <877evwurfm.fsf@gnu.org>
	<20171015211123.08bbae84@cbaines.net>
Date: Mon, 16 Oct 2017 09:27:57 +0200
In-Reply-To: <20171015211123.08bbae84@cbaines.net> (Christopher Baines's
	message of "Sun, 15 Oct 2017 21:11:23 +0100")
Message-ID: <87inffimbm.fsf@gnu.org>
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: Christopher Baines <mail@cbaines.net>
Cc: 28805@debbugs.gnu.org

Hi!

Christopher Baines <mail@cbaines.net> skribis:

> From 43ad9a4e6db6f4f94d2b2f63cbd9b729f5d4e607 Mon Sep 17 00:00:00 2001
> From: Christopher Baines <mail@cbaines.net>
> Date: Wed, 11 Oct 2017 14:46:47 +0100
> Subject: [PATCH] gnu: Add emacs-org-contrib.
>
> * gnu/packages/emacs.scm (emacs-org-contrib): New variable.

[...]

> +       (modify-phases %standard-phases
> +         (add-after 'install 'delete-org-files
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (org (assoc-ref inputs "emacs-org"))
> +                    (contrib-files
> +                     (map basename (find-files out)))
> +                    (org+contrib-files
> +                     (map basename (find-files org)))
> +                    (duplicates (lset-intersection
> +                                 string=3D? contrib-files org+contrib-fi=
les)))
> +               (with-directory-excursion
> +                   (string-append
> +                    out "/share/emacs/site-lisp/guix.d/org-contrib-"
> +                    ,(package-version emacs-org))
> +                 (for-each delete-file duplicates))))))))

Awesome.  Just return #t and we=E2=80=99re done.  :-)

Thank you!

Ludo=E2=80=99.