From 084a0f42a35c7854dcd8b03796f4a1bbb251a864 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 31 Mar 2025 03:54:23 -0400 Subject: [PATCH] bump: ws-butler lewang/ws-butler@d3927f6131f2 -> emacsmirror/nongnu_elpa@9ee5a7657a22 ws-butler was moved to a branch of the emacsmirror/nongnu_elpa repo, but Straight already uses this repo for recipe lookups and struggles to host multiple packages that live in the same repo but different branches. To get around this, Straight must be forced to clone it twice with an explicit recipe. This needs to be revisited, because this will likely happen again in the future... Fix: #8333 Ref: emacsmirror/nongnu_elpa@b890949b1bec --- lisp/packages.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/packages.el b/lisp/packages.el index cf264ab06..159d84e32 100644 --- a/lisp/packages.el +++ b/lisp/packages.el @@ -31,7 +31,15 @@ (package! better-jumper :pin "b1bf7a3c8cb820d942a0305e0e6412ef369f819c") (package! dtrt-indent :pin "22498ca24ac93c051d233abef630aece1ac45dd1") (package! smartparens :pin "b0d935c11813bcd40f8d35bae8800e0741334c29") -(package! ws-butler :pin "d3927f6131f215e9cd3e1f747be5a91e5be8ca9a") +(package! ws-butler + ;; REVIEW: Nongnu elpa serves this package from a branch of the nongnu_elpa + ;; repo; to stop Straight from clobbering a single repo, we must be + ;; explicit. + :recipe (:host github + :repo "emacsmirror/nongnu_elpa" + :branch "elpa/ws-butler" + :local-repo "ws-butler") + :pin "9ee5a7657a22e836618813c2e2b64a548d27d2ff") ;; doom-projects.el (package! projectile :pin "55db082cdf7b849335ccf24b7ba5aa2607d6fe93")