Subject: bug#28805: closed (Re: [bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 16 Oct 2017 07:41:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
28805: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=28805
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#28805] [PATCH] gnu: Add emacs-org-plus-contrib.
From: Christopher Baines <[email-masked]>
To: [email-masked] (Ludovic Courtès)
Cc: [email-masked]
Date: Mon, 16 Oct 2017 08:40:55 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

On Mon, 16 Oct 2017 09:27:57 +0200
[email-masked] (Ludovic Courtès) wrote:

> Hi!
> 
> Christopher Baines <[email-masked]> skribis:
> 
> > From 43ad9a4e6db6f4f94d2b2f63cbd9b729f5d4e607 Mon Sep 17 00:00:00 2001
> > From: Christopher Baines <[email-masked]>
> > 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=? 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))))))))  
> 
> Awesome.  Just return #t and we’re done.  :-)
> 
> Thank you!

Great, I've now added #t, and pushed this. Thanks for reviewing :)

Subject: [PATCH] gnu: Add emacs-org-plus-contrib.
From: Christopher Baines <[email-masked]>
To: [email-masked]
Date: Fri, 13 Oct 2017 06:45:42 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/emacs.scm (emacs-org-plus-contrib): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b29436154..de2b89370 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4005,6 +4005,30 @@ also is an authoring system with unique support for literate programming and
 reproducible research.")
     (license license:gpl3+)))
 
+(define-public emacs-org-plus-contrib
+  (package
+    (name "emacs-org-plus-contrib")
+    (version "20170917")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://orgmode.org/elpa/org-plus-contrib-"
+                                  version ".tar"))
+              (sha256
+               (base32
+                "1ya4kah8kg13ka3gpsw8hn6y8358843g986p1bgw5w77n9bgbwsl"))))
+    (build-system emacs-build-system)
+    (home-page "http://orgmode.org/")
+    (synopsis "Outline-based notes management and organizer (with contrib files)")
+    (description "Org is an Emacs mode for keeping notes, maintaining TODO
+lists, and project planning with a fast and effective plain-text system.  It
+also is an authoring system with unique support for literate programming and
+reproducible research.
+
+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.")
+    (license license:gpl3+)))
+
 (define-public emacs-flx
   (package
     (name "emacs-flx")
-- 
2.14.2