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

Rename doom-protected-packages => doom-core-packages

Browse source
This commit is contained in:
Henrik Lissner 2017-04-11 08:42:51 -04:00
parent 2aac675978
commit e3a33f6a9e
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/packages.el
View file

@ -76,7 +76,7 @@ Be careful not to use it in a loop."
(or (assq pkgsym doom-packages) (or (assq pkgsym doom-packages)
(list (car (assq pkgsym package-alist))))) (list (car (assq pkgsym package-alist)))))
(cl-delete-duplicates (cl-delete-duplicates
(append doom-protected-packages (mapcar 'car doom-packages)))))) (append doom-core-packages (mapcar 'car doom-packages))))))
;;;###autoload ;;;###autoload
(defun doom-get-depending-on (name) (defun doom-get-depending-on (name)
@ -107,7 +107,7 @@ depended on.
Used by `doom/packages-autoremove'." Used by `doom/packages-autoremove'."
(doom-initialize-packages t) (doom-initialize-packages t)
(let ((package-selected-packages (let ((package-selected-packages
(append (mapcar 'car doom-packages) doom-protected-packages))) (append (mapcar 'car doom-packages) doom-core-packages)))
(package--removable-packages))) (package--removable-packages)))
;;;###autoload ;;;###autoload

4
core/core-packages.el
View file

@ -49,7 +49,7 @@ This will be nil if you have byte-compiled your configuration (as intended).")
package's name as a symbol, and whose CDR is the plist supplied to its package's name as a symbol, and whose CDR is the plist supplied to its
`package!' declaration. Set by `doom-initialize-packages'.") `package!' declaration. Set by `doom-initialize-packages'.")
(defvar doom-protected-packages (defvar doom-core-packages
'(persistent-soft quelpa use-package) '(persistent-soft quelpa use-package)
"A list of packages that must be installed (and will be auto-installed if "A list of packages that must be installed (and will be auto-installed if
missing) and shouldn't be deleted.") missing) and shouldn't be deleted.")
@ -133,7 +133,7 @@ to speed up startup."
load-path (append load-path doom--package-load-path)) load-path (append load-path doom--package-load-path))
;; Ensure core packages are installed ;; Ensure core packages are installed
(let ((core-packages (cl-remove-if 'package-installed-p doom-protected-packages))) (let ((core-packages (cl-remove-if 'package-installed-p doom-core-packages)))
(when core-packages (when core-packages
(package-refresh-contents) (package-refresh-contents)
(dolist (pkg core-packages) (dolist (pkg core-packages)

6
test/core/test-core-lib-package.el
View file

@ -53,7 +53,7 @@ affects your Emacs packages)."
(package-alist (package-alist
`((doom-dummy nil) `((doom-dummy nil)
(doom-dummy-dep nil))) (doom-dummy-dep nil)))
doom-protected-packages) doom-core-packages)
(cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _)))) (cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _))))
(should (equal (doom-get-packages) '((doom-dummy))))))) (should (equal (doom-get-packages) '((doom-dummy)))))))
@ -65,7 +65,7 @@ no longer enabled or depended on."
`((doom-dummy ,(test-package-new 'doom-dummy '(20160405 1234) '((doom-dummy-dep (1 0))))) `((doom-dummy ,(test-package-new 'doom-dummy '(20160405 1234) '((doom-dummy-dep (1 0)))))
(doom-dummy-unwanted ,(test-package-new 'doom-dummy-unwanted '(20160601 1234))) (doom-dummy-unwanted ,(test-package-new 'doom-dummy-unwanted '(20160601 1234)))
(doom-dummy-dep ,(test-package-new 'doom-dummy-dep '(20160301 1234))))) (doom-dummy-dep ,(test-package-new 'doom-dummy-dep '(20160301 1234)))))
doom-protected-packages) doom-core-packages)
(cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _)))) (cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _))))
(should (equal (doom-get-orphaned-packages) '(doom-dummy-unwanted)))))) (should (equal (doom-get-orphaned-packages) '(doom-dummy-unwanted))))))
@ -74,6 +74,6 @@ no longer enabled or depended on."
aren't installed." aren't installed."
(let ((doom-packages '((doom-dummy) (doom-dummy-installed))) (let ((doom-packages '((doom-dummy) (doom-dummy-installed)))
(package-alist `((doom-dummy-installed ,(test-package-new 'doom-dummy-installed '(20160405 1234))))) (package-alist `((doom-dummy-installed ,(test-package-new 'doom-dummy-installed '(20160405 1234)))))
doom-protected-packages) doom-core-packages)
(cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _)))) (cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _))))
(should (equal (doom-get-missing-packages) '((doom-dummy)))))))) (should (equal (doom-get-missing-packages) '((doom-dummy))))))))