From dd348025233c2302bafc51d8832c5cc691a91b0f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 31 Jul 2022 16:08:33 +0200 Subject: [PATCH] revert: compat emacs-straight/compat@2a9cf8b7bdb5 -> emacs-straight/compat@cc1924fd8b3f compat is a dependency of magit and doom-modeline (among other packages), but a recent bug on compat@2a9cf8b caused #6583, so I am pinning it to a stable commit. It's not common that Doom pins 2nd/3rd order dependencies, but I will consider doing that more going forward. Pinning them across multiple modules isn't elegant, but a better solution is in the works as part of #4273. Fix: #6583 Ref: #4273 --- modules/tools/magit/packages.el | 1 + modules/ui/modeline/packages.el | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index d50836bd5..088715a02 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -2,6 +2,7 @@ ;;; tools/magit/packages.el (when (package! magit :pin "c1fb53d3de6390961ccd8dfb1cc135383508d0fc") + (package! compat :pin "cc1924fd8b3f9b75b26bf93f084ea938c06f9615") (when (featurep! +forge) (package! forge :pin "36208c43bf41782cfe81fccc904f8adbe57818e1")) (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b") diff --git a/modules/ui/modeline/packages.el b/modules/ui/modeline/packages.el index 390e3955d..00ace0d60 100644 --- a/modules/ui/modeline/packages.el +++ b/modules/ui/modeline/packages.el @@ -2,7 +2,8 @@ ;;; ui/modeline/packages.el (unless (featurep! +light) - (package! doom-modeline :pin "ce9899f00af40edb78f58b9af5c3685d67c8eed2")) + (package! doom-modeline :pin "ce9899f00af40edb78f58b9af5c3685d67c8eed2") + (package! compat :pin "cc1924fd8b3f9b75b26bf93f084ea938c06f9615")) (package! anzu :pin "5abb37455ea44fa401d5f4c1bdc58adb2448db67") (when (featurep! :editor evil) (package! evil-anzu :pin "d3f6ed4773b48767bd5f4708c7f083336a8a8a86"))