diff options
author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2021-11-26 00:12:25 -0500 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-11-28 21:54:02 +0100 |
commit | 5ee135df5f6c5b88045bb0f3a35d47caee44d0f8 (patch) | |
tree | b7bbee86ff4d818ca3dff62b7f43624ff21b4691 /gnu | |
parent | b8abc6c88a3d2a52d4f6292c9f7769d35968a0dc (diff) |
gnu: emacs-org: Don't use release tar.
* gnu/packages/emacs-xyz.scm (emacs-org):
[source]: Use git repository.
[arguments]: Add phases to help with building.
[native-inputs]: Add texinfo.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/emacs-xyz.scm | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c92331df9c..0859c1efe8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12296,24 +12296,47 @@ passive voice.") (version "9.5") (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/emacs/org-mode.git") + (commit (string-append "release_" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "16cflg5nms5nb8w86nvwkg49zkl0rvdhigkf4xpvbs0v7zb5y3ky")))) + (base32 "1gnzx53gkg2c6ljam31bvbibkra66lfx0w04jqmsv2gk8613527r")))) (build-system emacs-build-system) (arguments - `(#:phases + `(#:tests? #t + #:test-command '("make" "test-dirty") + #:phases (modify-phases %standard-phases - (add-after 'install 'install-documentation + (delete 'build) + (add-before 'check 'make + (lambda _ + (invoke "make" (string-append "ORGVERSION=" ,version)))) + (replace 'install (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" info-dir) - (install-file "orgguide.info" info-dir) - ;; XXX: "orgcard.pdf" is not built in Org 9.5. - ;; (install-file "orgcard.pdf" doc-dir) - )))))) + (substitute* "local.mk" + (("^prefix.*") + (string-append "prefix = " (assoc-ref outputs "out"))) + (("^lispdir.*") + (string-append "lispdir = " + (elpa-directory (assoc-ref outputs "out"))))) + (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))))))))) + (native-inputs + `(("texinfo" ,texinfo))) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") (description "Org is an Emacs mode for keeping notes, maintaining TODO |