From c3c001ad7ded36216682c8cd6ece90734e89f8a0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 4 Feb 2021 05:47:52 -0500 Subject: [PATCH] Bump core domtronn/all-the-icons.el@c795d0f -> domtronn/all-the-icons.el@5fa7283 hlissner/emacs-so-long@ed666b0 -> emacs-straight/so-long@a5d445d jwiegley/use-package@365c73d -> jwiegley/use-package@317137b raxod502/straight.el@ac4df5c -> raxod502/straight.el@f2cb888 + Complain if :no-byte-compile, :no-native-compile, or :no-build are used in package!. Straight replaced them with :build (and the old :build was renamed to :pre-build). See raxod502/straight.el@6a273d1 + Update getting_started.org to mention :build + Switch to emacs-straight/so-long so I don't have to maintain my mirror anymore. --- core/core-packages.el | 4 ++-- core/core-ui.el | 4 ++-- core/packages.el | 17 ++++++----------- docs/getting_started.org | 6 +++--- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 8e8020271..856f269a5 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -496,8 +496,8 @@ elsewhere." (when-let (recipe (plist-get plist :recipe)) (cl-destructuring-bind (&key local-repo _files _flavor - _build _pre-build _post-build _no-byte-compile _includes - _no-native-compile _no-autoloads _type _repo _host _branch + _build _pre-build _post-build _includes + _type _repo _host _branch _remote _nonrecursive _fork _depth) recipe ;; Expand :local-repo from current directory diff --git a/core/core-ui.el b/core/core-ui.el index 417349677..d237942c1 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -637,7 +637,7 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.") ;; `load-theme' doesn't disable previously enabled themes, which seems ;; like what you'd want. You could always use `enable-theme' to activate ;; multiple themes instead. - (mapc #'disable-theme (remq theme (remq 'use-package custom-enabled-themes))) + (mapc #'disable-theme (remq theme custom-enabled-themes)) (run-hooks 'doom-load-theme-hook)) result))) @@ -649,7 +649,7 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.") "Disable other themes when loading a new one." :before #'load-theme (unless no-enable - (mapc #'disable-theme (remq 'use-package custom-enabled-themes)))) + (mapc #'disable-theme custom-enabled-themes))) ;; DEPRECATED Not needed in Emacs 27 (defadvice! doom--prefer-compiled-theme-a (orig-fn &rest args) diff --git a/core/packages.el b/core/packages.el index 26e9fe30e..94be74ba1 100644 --- a/core/packages.el +++ b/core/packages.el @@ -17,15 +17,15 @@ :branch ,straight-repository-branch :local-repo "straight.el" :files ("straight*.el")) - :pin "ac4df5c689557f5434d6fc9f713e907e7b37a6bd") + :pin "f2cb888f088a790bac8731b95eeec3df068cac5f") ;; core-modules.el (package! use-package :type 'core - :pin "365c73d2618dd0040a32c2601c5456ab5495b812") + :pin "317137b07687f16ea97a2493b0a6768c9df381a0") ;; core-ui.el -(package! all-the-icons :pin "c795d0f0a49b1823d167a252319ac32c59152d72") +(package! all-the-icons :pin "5fa728399bd6233a82bbfd4f7cb203a1d7ede708") (package! hide-mode-line :pin "88888825b5b27b300683e662fa3be88d954b1cea") (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307") (package! rainbow-delimiters :pin "f43d48a24602be3ec899345a3326ed0247b960c6") @@ -37,13 +37,8 @@ (package! helpful :pin "584ecc887bb92133119f93a6716cdf7af0b51dca") (package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d") (package! smartparens :pin "63695c64233d215a92bf08e762f643cdb595bdd9") -(package! so-long - :built-in 'prefer ; included in Emacs 27+ - ;; REVIEW so-long is slated to be published to ELPA eventually, but until then - ;; I've created my own mirror for it because git.savannah.gnu.org runs - ;; on a potato. - :recipe (:host github :repo "hlissner/emacs-so-long") - :pin "ed666b0716f60e8988c455804de24b55919e71ca") +;; DEPRECATED Built into Emacs 27+; remove when we drop 26 support +(package! so-long :built-in 'prefer :pin "a5d445de4829b2327bd51dad2fb04291c7a0ec5f") (package! ws-butler ;; Use my fork of ws-butler, which has a few choice improvements and ;; optimizations (the original has been abandoned). @@ -51,7 +46,7 @@ :pin "2bb49d3ee7d2cba133bc7e9cdac416cd1c5e4fe0") ;; core-projects.el -(package! projectile :pin "793abfead25a7ef92ad3a443ad3067a82f4a2fb9") +(package! projectile :pin "fd5994762a90c2311e8aa40c37373f24e1743a55") ;; core-keybinds.el (package! general :pin "a0b17d207badf462311b2eef7c065b884462cb7c") diff --git a/docs/getting_started.org b/docs/getting_started.org index 828ffdb14..61e42b71b 100644 --- a/docs/getting_started.org +++ b/docs/getting_started.org @@ -932,9 +932,9 @@ live testing. To do this specify a ~:local-repo~ in that package's recipe: ;; you want: :files ("*.el" "src/lisp/*.el") - ;; With ':no-byte-compile t' you can avoid having to run 'doom sync' - ;; every time you change the package. - :no-byte-compile t)) + ;; With this you can avoid having to run 'doom sync' every time you + ;; change the package. + :build (:not compile))) #+END_SRC Alternatively, add the package's location to Emacs' ~load-path~. Do this if you