From ed5c7a21d7d63c8c400d8fabb3cac3426c90e937 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 2 Jun 2021 18:29:24 -0400 Subject: [PATCH] Prioritize emacs-mirror over melpa/elpa/etc We can't be certain where MELPA/ELPA packages come from, but occasionally, their hosted on unstable servers (savannah) or git servers with certain features disabled (as is the case for paredit's not allowing shallow clones). Trust in emacsmirror, and we can be more certain the package is coming from github. This may trigger a rebuild of your packages! --- core/core-packages.el | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 08f7c02e907..ee0962a4fd2 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -169,12 +169,22 @@ uses a straight or package.el command directly).") (funcall call "git" "reset" "--hard" pin))))))))) (require 'straight (concat repo-dir "/straight.el")) (doom-log "Initializing recipes") - (with-temp-buffer - (insert-file-contents (doom-path repo-dir "bootstrap.el")) - ;; Don't install straight for us -- we've already done that -- only set - ;; up its recipe repos for us. - (eval-region (search-forward "(require 'straight)") - (point-max))))) + (mapc #'straight-use-recipes + '((org-elpa :local-repo nil) + ;; Give emacs-mirror higher priority than MELPA, because who knows + ;; where MELPA packages come from. + (emacsmirror-mirror :type git :host github + :repo "emacs-straight/emacsmirror-mirror" + :build nil) + (melpa :type git :host github + :repo "melpa/melpa" + :build nil) + (gnu-elpa-mirror :type git :host github + :repo "emacs-straight/gnu-elpa-mirror" + :build nil) + (el-get :type git :host github + :repo "dimitri/el-get" + :build nil))))) (defun doom--ensure-core-packages (packages) (doom-log "Installing core packages")