emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add org elpa archive + update lang/org #327

Browse source 
Now that the org ELPA archive has https support, we can add it to
package-archives. This fixes some 'org is unavailable' errors when
installing org packages that have declared earlier versions of org as
a dependency.

This also makes installing a newer version of org-mode much simpler.
Woo!
This commit is contained in:
Henrik Lissner 2018-01-04 16:04:48 -05:00
parent 7556762d98
commit 2598d48bba
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/core-packages.el
View file

@ -92,7 +92,8 @@ base by `doom!' and for calculating how many packages exist.")
package-enable-at-startup nil package-enable-at-startup nil
package-archives package-archives
'(("gnu" . "https://elpa.gnu.org/packages/") '(("gnu" . "https://elpa.gnu.org/packages/")
("melpa" . "https://melpa.org/packages/")) ("melpa" . "https://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/"))
;; I omit Marmalade because its packages are manually submitted rather ;; I omit Marmalade because its packages are manually submitted rather
;; than pulled, so packages are often out of date with upstream. ;; than pulled, so packages are often out of date with upstream.

7
modules/lang/org/config.el
View file

@ -4,9 +4,10 @@
"The directory where org files are kept.") "The directory where org files are kept.")
;; Ensure ELPA org is prioritized above built-in org. ;; Ensure ELPA org is prioritized above built-in org.
(when-let* ((path (locate-library "org" nil doom--package-load-path))) (when-let* ((path (locate-library "org" nil doom--base-load-path)))
(setq load-path (delete path load-path)) (setq load-path
(push (file-name-directory path) load-path)) (delete (substring (file-name-directory path) 0 -1)
load-path)))
;; Sub-modules ;; Sub-modules
(if (featurep! +attach) (load! +attach)) (if (featurep! +attach) (load! +attach))

8
modules/lang/org/packages.el
View file

@ -1,12 +1,8 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; lang/org/packages.el ;;; lang/org/packages.el
(when (version< emacs-version "26.1") ;; Installs a cutting-edge version of org-mode
;; We want org 9.1.x, but the org packaged with Emacs 25.x and under is 8.x. (package! org-plus-contrib)
;; The only secure (and reasonably trustworthy) source for this is via
;; emacsmirror. Emacs 26+ comes with Org 9.1.4.
(package! org-plus-contrib
:recipe (:fetcher github :repo "emacsmirror/org" :files (:defaults "contrib/lisp/*.el"))))
(package! org-bullets :recipe (:fetcher github :repo "hlissner/org-bullets")) (package! org-bullets :recipe (:fetcher github :repo "hlissner/org-bullets"))
(package! toc-org) (package! toc-org)