gnu: Add emacs-org-9.4.2 and emacs-org-contrib-20201213.

* guix/wigust/packages/emacs.scm
(emacs-org-9.4.2, emacs-org-contrib-20201213): New variables.

1 files changed, 83 insertions, 0 deletions

diff --git a/guix/wigust/packages/emacs.scm b/guix/wigust/packages/emacs.scm
index 490acc4..2a4de98 100644
--- a/guix/wigust/packages/emacs.scm
+++ b/guix/wigust/packages/emacs.scm
@@ -1721,3 +1721,86 @@ and InfluxDB.")
       (description
        "This package provides automatiic org timers for upcoming events.")
       (license license:gpl3+))))
+
+;; Workaround [[https://orgmode.org/list/87y2hi9qev.fsf@gmx.com/][Bug: (org-release) returns empty string on Elpa [ ( @ /home/pierre/.guix-profile/share/emacs/site-lisp/)] - Pierre Langlois]]
+(define-public emacs-org-9.4.2
+  (package
+    (name "emacs-org")
+    ;; emacs-org-contrib inherits from this package.  Please update it as
+    ;; well.
+    (version "9.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar"))
+       (sha256
+        (base32 "1bkihy9zd8c1xxlmin1mzafn9kp8a9b3pq0f7bs0yzvxla9dvx98"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((share (string-append (assoc-ref outputs "out") "/share"))
+                    (info-dir (string-append share "/info"))
+                    (doc-dir (string-append share "/doc/" ,name "-" ,version)))
+               (install-file "org" info-dir)
+               (install-file "orgcard.pdf" doc-dir))
+             #t)))))
+    (home-page "https://orgmode.org/")
+    (synopsis "Outline-based notes management and organizer")
+    (description "Org is an Emacs mode for keeping notes, maintaining TODO
+lists, and project planning with a fast and effective lightweight markup
+language.  It also is an authoring system with unique support for literate
+programming and reproducible research.")
+    (license license:gpl3+)))
+
+(define-public emacs-org-contrib-20201213
+  (package
+    (inherit emacs-org)
+    (name "emacs-org-contrib")
+    (version "20201213")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://orgmode.org/elpa/"
+                           "org-plus-contrib-" version ".tar"))
+       (sha256
+        (base32 "0ljjx6zaqphqhm434ymv3bcpyxqymzpaifdh8nkzg8vdzyfma580"))
+       ;; ob-sclang.el is packaged separately to avoid the dependency on
+       ;; SuperCollider and qtwebengine.
+       (modules '((guix build utils)))
+       (snippet '(begin (delete-file "ob-sclang.el") #t))))
+    (arguments
+     `(#:modules ((guix build emacs-build-system)
+                  (guix build utils)
+                  (guix build emacs-utils)
+                  (ice-9 ftw)
+                  (srfi srfi-1))
+       #:phases
+       (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 "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")
+                 (for-each delete-file duplicates))
+               #t))))))
+    (propagated-inputs
+     `(("arduino-mode" ,emacs-arduino-mode)
+       ("cider" ,emacs-cider)
+       ("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 is equivalent to org-plus-contrib, but only includes additional
+files that you would find in @file{contrib/} from the git repository.")))