Bump :core
Fuco1/smartparens@7f5825d -> Fuco1/smartparens@63695c6 bbatsov/projectile@d1cfad0 -> bbatsov/projectile@c31bd41 domtronn/all-the-icons.el@6917b08 -> domtronn/all-the-icons.el@9aa16ae iqbalansari/restart-emacs@e570749 -> iqbalansari/restart-emacs@1607da2 jscheid/dtrt-indent@a7ade6d -> jscheid/dtrt-indent@854b9a1 justbur/emacs-which-key@ca268fd -> justbur/emacs-which-key@428aedf jwiegley/use-package@caa92f1 -> jwiegley/use-package@365c73d raxod502/straight.el@3277e1c -> raxod502/straight.el@a32c97c + Closes #4513 + Fixes (wrong-number-of-arguments (3 . 4) 2) error for users on Emacs HEAD (see bbatsov/projectile#1635). + package! :build semantics have changed due to upstream changes. What was :build is now :pre-build. What was :no-build is now :build nil. + Now we must be careful not to auto-disable the "use-package" psuedo theme. It is used as a place to store :custom assignments without them being saved to custom.el.
This commit is contained in:
parent
c8bfbda556
commit
cfb8a866dc
6 changed files with 59 additions and 32 deletions
|
@ -235,7 +235,12 @@ processed."
|
|||
|
||||
(defun doom-package-recipe (package &optional prop nil-value)
|
||||
"Returns the `straight' recipe PACKAGE was registered with."
|
||||
(let ((plist (gethash (symbol-name package) straight--recipe-cache)))
|
||||
(let* ((recipe (straight-recipes-retrieve package))
|
||||
(plist (doom-plist-merge
|
||||
(plist-get (alist-get package doom-packages) :recipe)
|
||||
(cdr (if (memq (car recipe) '(quote \`))
|
||||
(eval recipe t)
|
||||
recipe)))))
|
||||
(if prop
|
||||
(if (plist-member plist prop)
|
||||
(plist-get plist prop)
|
||||
|
@ -244,8 +249,14 @@ processed."
|
|||
|
||||
(defun doom-package-recipe-repo (package)
|
||||
"Resolve and return PACKAGE's (symbol) local-repo property."
|
||||
(if-let* ((recipe (cdr (straight-recipes-retrieve package)))
|
||||
(repo (straight-vc-local-repo-name recipe)))
|
||||
(if-let* ((recipe (copy-sequence (doom-package-recipe package)))
|
||||
(recipe (if (and (not (plist-member recipe :type))
|
||||
(memq (plist-get recipe :host) '(github gitlab bitbucket)))
|
||||
(plist-put recipe :type 'git)
|
||||
recipe))
|
||||
(repo (if-let (local-repo (plist-get recipe :local-repo))
|
||||
(file-name-nondirectory (directory-file-name local-repo))
|
||||
(ignore-errors (straight-vc-local-repo-name recipe)))))
|
||||
repo
|
||||
(symbol-name package)))
|
||||
|
||||
|
@ -482,7 +493,7 @@ elsewhere."
|
|||
(when-let (recipe (plist-get plist :recipe))
|
||||
(cl-destructuring-bind
|
||||
(&key local-repo _files _flavor
|
||||
_no-build _build _post-build _no-byte-compile
|
||||
_build _pre-build _post-build _no-byte-compile
|
||||
_no-native-compile _no-autoloads _type _repo _host _branch
|
||||
_remote _nonrecursive _fork _depth)
|
||||
recipe
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue