From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e401K-000400-0W for guix-patches@gnu.org; Mon, 16 Oct 2017 03:41:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e401G-0007ov-Sy for guix-patches@gnu.org; Mon, 16 Oct 2017 03:41:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33731) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e401G-0007ol-PD for guix-patches@gnu.org; Mon, 16 Oct 2017 03:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e401G-0007qm-ID for guix-patches@gnu.org; Mon, 16 Oct 2017 03:41:02 -0400 Subject: bug#28805: [PATCH] gnu: Add emacs-org-plus-contrib. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Mon, 16 Oct 2017 08:40:55 +0100 From: Christopher Baines Message-ID: <20171016084055.02cb9ebc@cbaines.net> In-Reply-To: <87inffimbm.fsf@gnu.org> References: <20171013054542.2032-1-mail@cbaines.net> <87shemybat.fsf@gnu.org> <20171015200517.253789a0@cbaines.net> <877evwurfm.fsf@gnu.org> <20171015211123.08bbae84@cbaines.net> <87inffimbm.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/HTTuhszgWk=wz_3+gqC6VZG"; protocol="application/pgp-signature" 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28805-done@debbugs.gnu.org --Sig_/HTTuhszgWk=wz_3+gqC6VZG Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, 16 Oct 2017 09:27:57 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hi! >=20 > Christopher Baines skribis: >=20 > > From 43ad9a4e6db6f4f94d2b2f63cbd9b729f5d4e607 Mon Sep 17 00:00:00 2001 > > From: Christopher Baines > > 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. =20 >=20 > [...] >=20 > > + (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-= files))) > > + (with-directory-excursion > > + (string-append > > + out "/share/emacs/site-lisp/guix.d/org-contrib-" > > + ,(package-version emacs-org)) > > + (for-each delete-file duplicates)))))))) =20 >=20 > Awesome. Just return #t and we=E2=80=99re done. :-) >=20 > Thank you! Great, I've now added #t, and pushed this. Thanks for reviewing :) --Sig_/HTTuhszgWk=wz_3+gqC6VZG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnkYodfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XeT9g/+M2BI2CvtC8/M22LPBarkQEU6gOv5ZYhefK8GlAq8cuMfJS0MQ/GKR4zS q9sOHowsmYdtAin55Q4FfJCi4E9YGvK6NSrJSNSq2EE5TFOY7lnkQxBixecsHhKm w0F34jV+9iUWmY9NIXq+vF0G91tVCV1CEteWn1DF4iiofO1Gi9CS5Rd/TTE43twE QD6LXzMe1sm04bNEbjuIXi+unAanx8gYoO9hRCNmJn3HllxQhbU7ZZfUmkSPdsDL Po7BNuapA6tOESatta6YsknzGXouD4EbLnxo0n5ofT+LeH8KQ3bebeQFj41UjLt7 atGpqauvjua7LJ45u4xL9dBu+8nkZ5QjCPPDLVPK5q7x48Yo7w+CM0LVVTqba9EQ 0+iHusmzK7AinXlUmpyxuzWUP2W/OWYJf7d0/wplHmKHA07+D6SwxzeX2z1W307i IwQ/B9NzrDPv21odWZF/sFG6zMrFYi3DvzrR3gy/HQtDLf1WexYwQK4Un3Mzgp6v TGFuCzGw90blWMEiKQxFg0OPdH5To7uMsNHU2pXdN2yp0/w1DmI/QD4hwzCwUYqj ru3nJe9Fo3SfJEcxwHybnA7dkNbtCIGJ5rP/oyVSlirgQgKFrEez1t5YPXzv9f7g 4QtkjExF+H/PSB1JqyiMvdG3SsEZdWkqAbTesuK+/Gwp4dBSsT0= =cwcM -----END PGP SIGNATURE----- --Sig_/HTTuhszgWk=wz_3+gqC6VZG--