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

Update straight init

Browse source 
Since straight-allow-recipe-inheritance was introduced upstream, we no
longer need to merge recipes ourselves.
This commit is contained in:
Henrik Lissner 2019-11-22 22:58:49 -05:00
parent 9d9b6e514c
commit 9676c7a871
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/core-packages.el
View file

@ -214,16 +214,13 @@ necessary package metadata is initialized and available for them."
(setq doom-disabled-packages nil (setq doom-disabled-packages nil
doom-packages (doom-package-list)) doom-packages (doom-package-list))
(cl-loop for (pkg . plist) in doom-packages (cl-loop for (pkg . plist) in doom-packages
for ignored = (plist-get plist :ignore) if (plist-get plist :disable)
for disabled = (plist-get plist :disable)
if disabled
do (cl-pushnew pkg doom-disabled-packages) do (cl-pushnew pkg doom-disabled-packages)
else if (not ignored) else if (not (plist-get plist :ignore))
do (with-demoted-errors "Package error: %s" do (with-demoted-errors "Package error: %s"
(straight-register-package (straight-register-package
(if-let (recipe (plist-get plist :recipe)) (if-let (recipe (plist-get plist :recipe))
(let ((plist (straight-recipes-retrieve pkg))) (cons pkg recipe)
`(,pkg ,@(doom-plist-merge recipe (cdr plist))))
pkg)))) pkg))))
(unless doom-interactive-mode (unless doom-interactive-mode
(add-hook 'kill-emacs-hook #'doom--finalize-straight)))) (add-hook 'kill-emacs-hook #'doom--finalize-straight))))