summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-12-23 09:49:50 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-12-23 09:59:20 +0100
commit93a81f5f643782926bd0e87eb4a55efd9c67ad18 (patch)
treed47e9a9cac06dd4b04caa8cb6162069f0ec6b48d
parent13e5d3b1e1246838025d2fac227341363bce2f63 (diff)
gnu: emacs-org: Update to 9.4.4.
* gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.4.4. [arguments]: Install orgguide.info, but ignore orgcard.pdf, not provided in Org 9.4.4. (emacs-org-contrib): Update to 20201222.
-rw-r--r--gnu/packages/emacs-xyz.scm15
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b7a087112e..a548c83290 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10260,13 +10260,13 @@ passive voice.")
(name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update it as
;; well.
- (version "9.4.2")
+ (version "9.4.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar"))
(sha256
- (base32 "1bkihy9zd8c1xxlmin1mzafn9kp8a9b3pq0f7bs0yzvxla9dvx98"))))
+ (base32 "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b"))))
(build-system emacs-build-system)
(arguments
`(#:phases
@@ -10276,8 +10276,11 @@ passive voice.")
(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))
+ (install-file "org.info" info-dir)
+ (install-file "orgguide.info" info-dir)
+ ;; XXX: "orgcard.pdf" is not built in Org 9.4.4.
+ ;; (install-file "orgcard.pdf" doc-dir)
+ )
#t)))))
(home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer")
@@ -10291,14 +10294,14 @@ programming and reproducible research.")
(package
(inherit emacs-org)
(name "emacs-org-contrib")
- (version "20201213")
+ (version "20201222")
(source
(origin
(method url-fetch)
(uri (string-append "https://orgmode.org/elpa/"
"org-plus-contrib-" version ".tar"))
(sha256
- (base32 "0ljjx6zaqphqhm434ymv3bcpyxqymzpaifdh8nkzg8vdzyfma580"))
+ (base32 "1pa8h5dpi5yj3j7v0aaby8sjwxvmgnbip2ilyl5pac1rlbz0jn40"))
;; ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine.
(modules '((guix build utils)))