diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 7c6e358d4..04278e50d 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -76,7 +76,7 @@ Be careful not to use it in a loop." (or (assq pkgsym doom-packages) (list (car (assq pkgsym package-alist))))) (cl-delete-duplicates - (append doom-protected-packages (mapcar 'car doom-packages)))))) + (append doom-core-packages (mapcar 'car doom-packages)))))) ;;;###autoload (defun doom-get-depending-on (name) @@ -107,7 +107,7 @@ depended on. Used by `doom/packages-autoremove'." (doom-initialize-packages t) (let ((package-selected-packages - (append (mapcar 'car doom-packages) doom-protected-packages))) + (append (mapcar 'car doom-packages) doom-core-packages))) (package--removable-packages))) ;;;###autoload diff --git a/core/core-packages.el b/core/core-packages.el index 2ab62f5e1..d3a8cbdd8 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -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!' declaration. Set by `doom-initialize-packages'.") -(defvar doom-protected-packages +(defvar doom-core-packages '(persistent-soft quelpa use-package) "A list of packages that must be installed (and will be auto-installed if missing) and shouldn't be deleted.") @@ -133,7 +133,7 @@ to speed up startup." load-path (append load-path doom--package-load-path)) ;; 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 (package-refresh-contents) (dolist (pkg core-packages) diff --git a/test/core/test-core-lib-package.el b/test/core/test-core-lib-package.el index 991295ae6..96e16b52a 100644 --- a/test/core/test-core-lib-package.el +++ b/test/core/test-core-lib-package.el @@ -53,7 +53,7 @@ affects your Emacs packages)." (package-alist `((doom-dummy nil) (doom-dummy-dep nil))) - doom-protected-packages) + doom-core-packages) (cl-letf (((symbol-function 'doom-initialize-packages) (lambda (&rest _)))) (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-unwanted ,(test-package-new 'doom-dummy-unwanted '(20160601 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 _)))) (should (equal (doom-get-orphaned-packages) '(doom-dummy-unwanted)))))) @@ -74,6 +74,6 @@ no longer enabled or depended on." aren't installed." (let ((doom-packages '((doom-dummy) (doom-dummy-installed))) (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 _)))) (should (equal (doom-get-missing-packages) '((doom-dummy))))))))