From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3oEf-0007zF-A0 for guix-patches@gnu.org; Sun, 15 Oct 2017 15:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3oEc-0001yS-4F for guix-patches@gnu.org; Sun, 15 Oct 2017 15:06:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33244) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3oEb-0001yO-W9 for guix-patches@gnu.org; Sun, 15 Oct 2017 15:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3oEb-0000Dl-OG for guix-patches@gnu.org; Sun, 15 Oct 2017 15:06:01 -0400 Subject: [bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib. Resent-Message-ID: Date: Sun, 15 Oct 2017 20:05:17 +0100 From: Christopher Baines Message-ID: <20171015200517.253789a0@cbaines.net> In-Reply-To: <87shemybat.fsf@gnu.org> References: <20171013054542.2032-1-mail@cbaines.net> <87shemybat.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/Xv09BzAu.6/ADpXbXLKF3Q+"; 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@debbugs.gnu.org --Sig_/Xv09BzAu.6/ADpXbXLKF3Q+ Content-Type: multipart/mixed; boundary="MP_/3/N1tSNFZ42NvhZbzBlNC3u" --MP_/3/N1tSNFZ42NvhZbzBlNC3u Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Fri, 13 Oct 2017 23:42:34 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Christopher Baines skribis: >=20 > > * gnu/packages/emacs.scm (emacs-org-plus-contrib): New variable. =20 >=20 > [...] >=20 > > +This package includes all the functionality of the @code{emacs-org} pa= ckage, > > +plus all files that you would find in @file{contrib/} from the git > > +repository.") =20 >=20 > I=E2=80=99m sorry to ask ;-), but would it be an option to have a separate > =E2=80=98emacs-contrib=E2=80=99 package instead? That way people could i= nstall > emacs-org, and optionally emacs-contrib on top of it. No problem, I had a similar thought when I was first figuring out what this contrib thing was. I've attached my attempt at making an emacs-org-contrib package. Which binds it to the emacs-org package, propagates emacs-org, as well as deleting all the files included within the emacs-org package. Thanks for taking a look, Chris --MP_/3/N1tSNFZ42NvhZbzBlNC3u Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-emacs-org-contrib.patch =46rom 2c5b66bf198ae77047e7c3d4e5631b10e90981eb 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. --- gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7661855a8..7a97a5471 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4099,6 +4099,49 @@ also is an authoring system with unique support for = literate programming and reproducible research.") (license license:gpl3+))) =20 +(define-public emacs-org-contrib + (package + (inherit emacs-org) + (name "emacs-org-contrib") + (source (origin + (method url-fetch) + (uri (string-append "http://orgmode.org/elpa/org-plus-contri= b-" + (package-version emacs-org) ".tar")) + (sha256 + (base32 + "1ya4kah8kg13ka3gpsw8hn6y8358843g986p1bgw5w77n9bgbwsl")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'delete-org-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (ice-9 ftw)) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (file) + (if (and (not (string-prefix? "." file)) + (file-exists? file)) + (delete-file + (string-append + out + "/share/emacs/site-lisp/guix.d/org-contrib-" + ,(package-version emacs-org) + "/" + file)))) + (scandir + (string-append + (assoc-ref inputs "emacs-org") + "/share/emacs/site-lisp/guix.d/org-" + ,(package-version emacs-org)))))))))) + (propagated-inputs + `(("emacs-org" ,emacs-org))) + (synopsis "Contributed packages to Org-mode") + (description "Org is an Emacs mode for keeping notes, maintaining TODO +lists, and project planning with a fast and effective plain-text system. + +This package includes additional files that you would find in @file{contri= b/} +from the git repository."))) + (define-public emacs-flx (package (name "emacs-flx") --=20 2.14.2 --MP_/3/N1tSNFZ42NvhZbzBlNC3u-- --Sig_/Xv09BzAu.6/ADpXbXLKF3Q+ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnjsW1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xd3HBAAlJGPD/pqy3TSiC6eNw4izbzfcspP78QrY6I3AFUHU1pTuX+qyePq5yVr JJlTa/0FecgdWV+gYzEwEz0VS2GvjUNTIUQrSTv/bFGsnhKd87r7SVfsGZ1jkRnf eB0yU5LaSuSPI5tMhVEoBLzeFBtDwsC6P2JbZz9vAARkx1S5KpTMQ1QIxQeBBd4K Iw56d2BnB2idgPUZ8pONHFuowHcUT79Q7dNpJTSGY2ssfklPYwqz32axlfddcYxG bAI4gOotL/W7sgIyPhNokgAu86e+PiWS2Eo0BI9CamZ3CNk1E3BalPiJ1b+nV544 vxM17ZVoLHMyegfMZnSvrekgTCnJhgYIaiutKqvdPpNuvXCvscoWyBiMmxb8JIGr B22x43sMrvqkyFudQJORe1ObHuYPc8MCbcURwEpPjM5PQvQksC6VzjYo5F3/vhwD 0KBq2Uj0wab1BMf4AjRXFYObCmP9ACGIGKfT3g3n8FC/7lPdXLt22AQFKZ0Ih7wF lqTRNEQrst3AtynusPVP8TimXEHwosnTBcHBiCEcplymFz5eaMiljhkF7BSyu8V5 FayZa3D4suQN0K5no/43Go7bRp/YWn+0euL+ihdjzDE/L9tRTNn4tCs3DMgrwOgp V0UPg6Kayf+pJv60EIQPkvlbFdHYopOmjoxtEWgYlZ5k3fWHJZ4= =oaLM -----END PGP SIGNATURE----- --Sig_/Xv09BzAu.6/ADpXbXLKF3Q+--