[bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib.

[Christopher Baines <mail@cbaines.net>]

[-- Attachment #1.1: Type: text/plain, Size: 946 bytes --]

On Fri, 13 Oct 2017 23:42:34 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Christopher Baines <mail@cbaines.net> skribis:
> 
> > * gnu/packages/emacs.scm (emacs-org-plus-contrib): New variable.  
> 
> [...]
> 
> > +This package includes all the functionality of the @code{emacs-org} package,
> > +plus all files that you would find in @file{contrib/} from the git
> > +repository.")  
> 
> I’m sorry to ask ;-), but would it be an option to have a separate
> ‘emacs-contrib’ package instead?  That way people could install
> 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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-emacs-org-contrib.patch --]
[-- Type: text/x-patch, Size: 2586 bytes --]

From 2c5b66bf198ae77047e7c3d4e5631b10e90981eb 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.
---
 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+)))
 
+(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-contrib-"
+                                  (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{contrib/}
+from the git repository.")))
+
 (define-public emacs-flx
   (package
     (name "emacs-flx")
-- 
2.14.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 963 bytes --]