From 1878a08814c1fa293ddd6653c2cf8d9ec7754505 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 18 Jun 2020 15:29:37 -0400 Subject: [PATCH] Bump :core raxod502/straight.el@ffaad60 -> raxod502/straight.el@59c92dd jwiegley/use-package@d2640fe -> jwiegley/use-package@2b8f8a3 Reverts 33cd837 Fixes #3406 --- core/core-packages.el | 6 ------ core/packages.el | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 7251adfe3..a3244587d 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -105,12 +105,6 @@ uses a straight or package.el command directly).") (append (apply orig-fn args) ; lockfiles still take priority (doom-package-pinned-list))) -(with-eval-after-load 'straight - ;; HACK Fix #3406: by installing some built-in packages, we get version - ;; conflicts, so blacklist them. Revert once raxod502/straight.el#537 is - ;; resolved. - (add-to-list 'straight-recipes-gnu-elpa-ignored-packages 'seq)) - ;; ;;; Bootstrappers diff --git a/core/packages.el b/core/packages.el index b3d8e2323..2ee61a44e 100644 --- a/core/packages.el +++ b/core/packages.el @@ -14,12 +14,12 @@ :local-repo "straight.el" :files ("straight*.el") :no-build t) - :pin "ffaad607ad18d107a6d15ccb923be88c6c80172e") + :pin "59c92dd45085b8f8fc44ea0039c205f4a3c43b62") ;; core-modules.el (package! use-package :type 'core - :pin "d2640fec376a8458a669e7526e63e5870d875118") + :pin "2b8f8a3f156e61ae6d8c7b7ce1deea3f0f6e1599") ;; core-ui.el (package! all-the-icons :pin "ed8e44de4fa601309d2bba902c3b37cb73e4daa0")