diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2022-11-30 19:14:55 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2022-12-05 20:33:37 +0100 |
commit | 5c4d4729b3347db28d21ac18471f3667f93f10c9 (patch) | |
tree | 6e2905c2a22fa67348bf350d70b57db19ddd687b /gnu/packages/emacs-xyz.scm | |
parent | 0d4f6ef0dee186121e8aea18ac24461f1cc5e0a0 (diff) |
gnu: emacs-org: Update to 9.6.
* gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.6.
[source]: Remove ".git" suffix from URL.
[arguments]: Use G-expressions.
<#:phases> Add or modify phases to fix tests. Install documentation,
including ORG-NEWS. Also install data files to a less exotic location.
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 94 |
1 files changed, 58 insertions, 36 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48bb9317f4..623591247e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14146,51 +14146,73 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.5.5") + (version "9.6") (source (origin (method git-fetch) (uri (git-reference - (url "https://git.savannah.gnu.org/git/emacs/org-mode.git") + (url "https://git.savannah.gnu.org/git/emacs/org-mode") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bswysz5laiya9pm689v4rpxjlfqg21azyh1jal9jq80iwjwi2p8")))) + (base32 "1pi9kkcbvsrvw009lf6q2l68n9jyjks94xjqyn36zq1vqcvmg33d")))) (build-system emacs-build-system) (arguments - `(#:tests? #t - #:test-command '("make" "test-dirty") - #:phases - (modify-phases %standard-phases - (add-before 'check 'make - (lambda _ - (invoke "make" (string-append "ORGVERSION=" ,version)))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "local.mk" - (("^prefix.*") - (string-append "prefix = " (assoc-ref outputs "out"))) - (("^lispdir.*") - (string-append "lispdir = " - (elpa-directory (assoc-ref outputs "out"))))) - ;; The dependent targets for install perform cleanup that - ;; partially undoes our make phase - (substitute* "lisp/Makefile" - (("^install:.*") "install:\n")) - (invoke "make" "install"))) - (add-after 'unpack 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; These files are modified during testing - (with-directory-excursion "testing/examples" - (for-each make-file-writable - '("babel.org" - "ob-awk-test.org" - "ob-sed-test.org" - "ob-shell-test.org")) - ;; Specify where sh is - (substitute* "babel.org" - (("/bin/sh" sh) - (string-append (assoc-ref inputs "bash") sh))))))))) + (list + #:tests? #t + #:test-command #~(list "make" "test-dirty") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'configure + ;; XXX: Generate "org-loaddefs.el" and set proper version string. + (lambda _ + (invoke "make" "autoloads" + (string-append "ORGVERSION=" #$version)) + (let ((elpa (elpa-directory #$output)) + (info (string-append #$output "/share/info"))) + (substitute* "local.mk" + (("^lispdir.*") (string-append "lispdir = " elpa)) + (("^datadir.*") (string-append "datadir = " elpa "/etc")) + (("^infodir.*") (string-append "infodir = " info)))))) + (add-after 'configure 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; XXX: Running tests updates ID locations. The process expects + ;; a file to be writeable in "~/.emacs.d/". + (setenv "HOME" (getcwd)) + (mkdir-p ".emacs.d") + ;; These files are modified during testing. + (with-directory-excursion "testing/examples" + (for-each make-file-writable + '("babel.org" + "ob-awk-test.org" + "ob-sed-test.org" + "ob-shell-test.org")) + ;; Specify where sh executable is. + (let ((sh (search-input-file inputs "/bin/sh"))) + (substitute* "babel.org" + (("/bin/sh") sh)))) + ;; XXX: Skip failing tests. + (substitute* "testing/lisp/test-ob-shell.el" + (("ob-shell/remote-with-stdin-or-cmdline .*" all) + (string-append all " (skip-unless nil)\n"))) + (substitute* "testing/lisp/test-org.el" + (("test-org/org-(encode-time|time-string-to-time) .*" all) + (string-append all " (skip-unless nil)\n"))))) + (replace 'expand-load-path + ;; Make sure `load-path' includes "lisp" directory, otherwise + ;; byte-compilation fails. + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'expand-load-path) args)))) + (replace 'install + (lambda _ + (invoke "make" "install"))) + (add-after 'install 'install-org-news + ;; Install ORG-NEWS files in doc directory. + (lambda _ + (install-file "etc/ORG-NEWS" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) (native-inputs (list texinfo)) (home-page "https://orgmode.org/") |