From 87f6f7ab91089235a66d9076fa50a5fc4d37dfea Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 13:32:57 -0500
Subject: [PATCH 1/7] bump: :lang scheme

emacs-geiser/chez@246ec4c8bc4e -> emacs-geiser/chez@605a81ff7b2d
emacs-geiser/geiser@e54d5e6dc659 -> emacs-geiser/geiser@49d12a14482c
emacs-geiser/guile@24ce15de235c -> emacs-geiser/guile@ee33af6b4ef8
flatwhatson/flycheck-guile@e23a4d781317 -> flatwhatson/flycheck-guile@dd7bbdc48fd2
flatwhatson/scheme-mode@aaef1f88cc34 -> flatwhatson/scheme-mode@51e586e5f1dd

- Lazy autoloads hack for geiser is no longer needed (see
  https://gitlab.com/emacs-geiser/geiser/-/commit/47bb86d6829ffa81ec021ee6217379b216d95bfc)
- (#7472) Fixes geiser-activate-implementation errors from `doom doctor`

Fix: #7472
Ref: https://gitlab.com/emacs-geiser/geiser/-/commit/47bb86d6829ffa81ec021ee6217379b216d95bfc
---
 modules/lang/scheme/autoload.el | 17 -----------------
 modules/lang/scheme/packages.el | 10 +++++-----
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/modules/lang/scheme/autoload.el b/modules/lang/scheme/autoload.el
index 47d664680..75796492d 100644
--- a/modules/lang/scheme/autoload.el
+++ b/modules/lang/scheme/autoload.el
@@ -1,22 +1,5 @@
 ;;; lang/scheme/autoload.el -*- lexical-binding: t; -*-
 
-;; HACK `geiser' has poor autoload etiquette. It calls
-;;      `geiser-activate-implementation' and `geiser-implementation-extension'
-;;      in their autoloads files. Sure, these functions are autoloaded, but this
-;;      needlessly (and unavoidably) pulls in the `geiser-impl' package (et co)
-;;      when geiser-X's autoloads are read (i.e. at startup).
-;;
-;;      I rectify this by inlining calls to these two functions (and the
-;;      `geiser-impl--add-to-alist' sub-call in
-;;      `geiser-implementation-extension'), and autoloading the two variables
-;;      they operate on. I do this from our autoloads file (which is
-;;      byte-compiled and read at startup before package autoloads).
-;; TODO At some point, PR this behavior upstream (but not verbatim!)
-;;;###autoload (defvar geiser-active-implementations ())
-;;;###autoload (defvar geiser-implementations-alist ())
-;;;###autoload (eval-and-compile (dolist (sym '(geiser-impl--add-to-alist geiser-activate-implementation geiser-implementation-extension)) (put sym 'byte-optimizer 'byte-compile-inline-expand)))
-
-
 (defvar calculate-lisp-indent-last-sexp)
 ;; Adapted from https://github.com/alezost/emacs-config/blob/master/utils/al-scheme.el#L76-L123
 ;;;###autoload
diff --git a/modules/lang/scheme/packages.el b/modules/lang/scheme/packages.el
index 449e3c8a6..5486dba71 100644
--- a/modules/lang/scheme/packages.el
+++ b/modules/lang/scheme/packages.el
@@ -4,12 +4,12 @@
 (when (< emacs-major-version 29)
   (package! scheme
     :recipe (:host gitlab :repo "flatwhatson/scheme-mode")
-    :pin "aaef1f88cc34e8b6e07c207f9b8caff33f6e0740"))
+    :pin "51e586e5f1ddb5ea71d2cac8d401faf718c4627e"))
 
-(when (package! geiser :pin "e54d5e6dc659c252d10c4280f4c4d78d38623df5")
+(when (package! geiser :pin "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe")
   (package! macrostep-geiser :pin "f6a2d5bb96ade4f23df557649af87ebd0cc45125")
   (when (modulep! +chez)
-    (package! geiser-chez :pin "246ec4c8bc4e7f64414e5cbe0fa66f0e5ef7d527"))
+    (package! geiser-chez :pin "605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d"))
   (when (modulep! +chibi)
     (package! geiser-chibi :pin "5a6a5a580ea45cd4974df21629a8d50cbe3d6e99"))
   (when (modulep! +chicken)
@@ -19,12 +19,12 @@
   (when (modulep! +gauche)
     (package! geiser-gauche :pin "8ff743f6416f00751e24aef8b9791501a40f5421"))
   (when (modulep! +guile)
-    (package! geiser-guile :pin "24ce15de235c105daf5ecfb818200dae1c9815ee")
+    (package! geiser-guile :pin "ee33af6b4ef8fdaccbdf93c62b50fe17c07a1ade")
     (when (and (modulep! :checkers syntax)
              (not (modulep! :checkers syntax +flymake)))
       (package! flycheck-guile
         :recipe (:host github :repo "flatwhatson/flycheck-guile")
-        :pin "e23a4d7813179124fd98abf1c2f4190a72569bee")))
+        :pin "dd7bbdc48fd21cf8d270c913c56cd580f8ec3d03")))
   (when (modulep! +kawa)
     (package! geiser-kawa :pin "5896b19642923f74f718eb68d447560b2d26d797"))
   (when (modulep! +mit)

From f9c2397a3cee34732b8279bba49af1e6f09eb113 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 16:07:21 -0500
Subject: [PATCH 2/7] fix: autoloads load order in profile bootstrap

Package autoloads should be assembled in the order they're
installed/built, so that dependencies between them (such as the case
where geiser-* packages call geiser-activate-implementation, which is
defined in geiser.el's autoloads file -- see #7472) don't throw errors.

Fix: #7472
Amend: 87f6f7ab9108
---
 lisp/doom-profiles.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/doom-profiles.el b/lisp/doom-profiles.el
index 2e482c0ec..f60531174 100644
--- a/lisp/doom-profiles.el
+++ b/lisp/doom-profiles.el
@@ -449,8 +449,8 @@ Defaults to the profile at `doom-profile-default'."
 (defun doom-profile--generate-package-autoloads ()
   (doom-autoloads--scan
    (mapcar #'straight--autoloads-file
-           (seq-difference (hash-table-keys straight--build-cache)
-                           doom-autoloads-excluded-packages))
+           (nreverse (seq-difference (hash-table-keys straight--build-cache)
+                                     doom-autoloads-excluded-packages)))
    doom-autoloads-excluded-files
    'literal))
 

From 6ca6bf09355dac948118c341d5ecf2731b66b50f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 16:11:16 -0500
Subject: [PATCH 3/7] bump: :lang haskell

emacs-lsp/lsp-haskell@918ffa2516a5 -> emacs-lsp/lsp-haskell@89d16370434e
haskell/haskell-mode@3e146c1a89db -> haskell/haskell-mode@79eaf444a721

- (#7569) Fixes flymake-proc load error.

Fix: #7569
Close: #7574
Co-authored-by: PatrickNorton <PatrickNorton@users.noreply.github.com>
---
 modules/lang/haskell/packages.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el
index a6b80c28f..6eecc104d 100644
--- a/modules/lang/haskell/packages.el
+++ b/modules/lang/haskell/packages.el
@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/haskell/packages.el
 
-(package! haskell-mode :pin "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51")
+(package! haskell-mode :pin "79eaf444a72109f93f552abb53f834cc63bbf9f2")
 
 (when (and (modulep! +lsp)
            (not (modulep! :tools lsp +eglot)))
-  (package! lsp-haskell :pin "918ffa2516a59c90f909b584f7c9968716c0e006"))
+  (package! lsp-haskell :pin "89d16370434e9a247e95b8b701f524f5abfc884b"))

From d55b078fa183cb2d44ad902e7d3760b1112b94b3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 16:13:01 -0500
Subject: [PATCH 4/7] bump: :checkers

alexmurray/flycheck-posframe@8f60c9bf124a -> alexmurray/flycheck-posframe@19896b922c76
bnbeckwith/writegood-mode@ed42d918d988 -> bnbeckwith/writegood-mode@d54eadeedb8b
d12frosted/flyspell-correct@7d7b6b01188b -> d12frosted/flyspell-correct@1e7a5a56362d
flycheck/flycheck@784f184cdd9f -> flycheck/flycheck@e56e30d8c66f
ideasman42/emacs-spell-fu@aed6e87aa310 -> ideasman42/emacs-spell-fu@e4031935803c
mhayashi1120/Emacs-langtool@8276eccc5587 -> mhayashi1120/Emacs-langtool@d86101eafe9a
---
 modules/checkers/grammar/packages.el | 4 ++--
 modules/checkers/spell/packages.el   | 4 ++--
 modules/checkers/syntax/packages.el  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/checkers/grammar/packages.el b/modules/checkers/grammar/packages.el
index 39da67b3b..f0082e185 100644
--- a/modules/checkers/grammar/packages.el
+++ b/modules/checkers/grammar/packages.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; checkers/grammar/packages.el
 
-(package! langtool :pin "8276eccc5587bc12fd205ee58a7a982f0a136e41")
-(package! writegood-mode :pin "ed42d918d98826ad88928b7af9f2597502afc6b0")
+(package! langtool :pin "d86101eafe9a994eb0425e08e7c1795e9cb0cd42")
+(package! writegood-mode :pin "d54eadeedb8bf3aa0e0a584c0a7373c69644f4b8")
diff --git a/modules/checkers/spell/packages.el b/modules/checkers/spell/packages.el
index 2af2169f0..eb2c07269 100644
--- a/modules/checkers/spell/packages.el
+++ b/modules/checkers/spell/packages.el
@@ -2,8 +2,8 @@
 ;;; checkers/spell/packages.el
 
 (if (not (modulep! +flyspell))
-    (package! spell-fu :pin "aed6e87aa31013534b7a6cbedb26e4f29ccea735")
-  (package! flyspell-correct :pin "7d7b6b01188bd28e20a13736ac9f36c3367bd16e")
+    (package! spell-fu :pin "e4031935803c66eca2f076dce72b0a6a770d026c")
+  (package! flyspell-correct :pin "1e7a5a56362dd875dddf848b9a9e25d1395b9d37")
   (cond ((modulep! :completion ivy)
          (package! flyspell-correct-ivy))
         ((modulep! :completion helm)
diff --git a/modules/checkers/syntax/packages.el b/modules/checkers/syntax/packages.el
index ccaaedc61..bd708b566 100644
--- a/modules/checkers/syntax/packages.el
+++ b/modules/checkers/syntax/packages.el
@@ -2,10 +2,10 @@
 ;;; checkers/syntax/packages.el
 
 (unless (modulep! +flymake)
-  (package! flycheck :pin "784f184cdd9f9cb4e3dbb997c09d93e954142842")
+  (package! flycheck :pin "e56e30d8c66ffc9776d07740658d3b542c1a8e21")
   (package! flycheck-popup-tip :pin "ef86aad907f27ca076859d8d9416f4f7727619c6")
   (when (modulep! +childframe)
-    (package! flycheck-posframe :pin "8f60c9bf124ab9597d681504a73fdf116a0bde12")))
+    (package! flycheck-posframe :pin "19896b922c76a0f460bf3fe8d8ebc2f9ac9028d8")))
 
 ;; Flymake
 (when (modulep! +flymake)

From 88c59129ec89afe8f38e3adb4676561fb5b41ccd Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 16:29:42 -0500
Subject: [PATCH 5/7] fix(lib): doom/bumpify-diff: skip non-package! forms

Would formerly error out if it tries to read invalid forms in misc files
included in bump commits.
---
 lisp/lib/packages.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/lib/packages.el b/lisp/lib/packages.el
index 96531b451..496091155 100644
--- a/lisp/lib/packages.el
+++ b/lisp/lib/packages.el
@@ -239,13 +239,14 @@ Must be run from a magit diff buffer."
         (unless (= (length before) (length after))
           (user-error "Uneven number of packages being bumped"))
         (dolist (p1 before)
-          (cl-destructuring-bind (package &key plist _beg _end &allow-other-keys) p1
-            (let ((p2 (cdr (assq package after))))
-              (if (null p2)
-                  (push package errors)
-                (let ((bstr1 (doom--package-to-bump-string package plist))
-                      (bstr2 (doom--package-to-bump-string package (plist-get p2 :plist))))
-                  (cl-pushnew (format "%s -> %s" bstr1 bstr2) lines :test #'equal))))))
+          (when (and (listp p1) (eq (car p1) 'package!))
+            (cl-destructuring-bind (package &key plist _beg _end &allow-other-keys) p1
+              (let ((p2 (cdr (assq package after))))
+                (if (null p2)
+                    (push package errors)
+                  (let ((bstr1 (doom--package-to-bump-string package plist))
+                        (bstr2 (doom--package-to-bump-string package (plist-get p2 :plist))))
+                    (cl-pushnew (format "%s -> %s" bstr1 bstr2) lines :test #'equal)))))))
         (if (null lines)
             (user-error "No bumps to bumpify")
           (prog1 (funcall (if interactive #'kill-new #'identity)

From fde4289f5ce2d5222b6cc81db5a6b6e6a5f71c31 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 29 Nov 2023 23:14:34 -0500
Subject: [PATCH 6/7] bump: :completion company helm ivy

Sodel-the-Vociferous/helm-company@6eb5c2d730a6 -> Sodel-the-Vociferous/helm-company@4622b8235322
abo-abo/swiper@9d630d800e85 -> abo-abo/swiper@8c30f4cab594
bbatsov/helm-projectile@35a2111d00c0 -> bbatsov/helm-projectile@e2e38825c975
company-mode/company-mode@9b21604d1969 -> company-mode/company-mode@ed46a616ab99
emacs-helm/helm-org@d67186d3a64e -> emacs-helm/helm-org@c80e53315ce6
emacs-helm/helm@dfd6403947c5 -> emacs-helm/helm@96aad023cb12
emacs-jp/helm-c-yasnippet@e214eec8b287 -> emacs-jp/helm-c-yasnippet@c5880e740da1
radian-software/prescient.el@d7cc55dad453 -> radian-software/prescient.el@707c25c947a9
tumashu/helm-posframe@87461b52b6f3 -> tumashu/helm-posframe@0b6bb016f0ff
yyoncho/helm-icons@53349000b114 -> yyoncho/helm-icons@0d113719ee72
---
 modules/completion/company/packages.el |  2 +-
 modules/completion/helm/packages.el    | 14 +++++++-------
 modules/completion/ivy/packages.el     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/completion/company/packages.el b/modules/completion/company/packages.el
index 0851bde07..d594c638b 100644
--- a/modules/completion/company/packages.el
+++ b/modules/completion/company/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/company/packages.el
 
-(package! company :pin "9b21604d19696de2c79ee28931620839b3a908b4")
+(package! company :pin "ed46a616ab9906fd43a630479b6a6c3f79e606f0")
 (package! company-dict :pin "cd7b8394f6014c57897f65d335d6b2bd65dab1f4")
 (when (modulep! +childframe)
   (package! company-box :pin "b6f53e26adf948aca55c3ff6c22c21a6a6614253"))
diff --git a/modules/completion/helm/packages.el b/modules/completion/helm/packages.el
index b97a060df..f037a770b 100644
--- a/modules/completion/helm/packages.el
+++ b/modules/completion/helm/packages.el
@@ -1,20 +1,20 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/helm/packages.el
 
-(package! helm :pin "dfd6403947c5cd9f32afcd6bc92a1756cc958c82")
-(package! helm-company :pin "6eb5c2d730a60e394e005b47c1db018697094dde")
-(package! helm-c-yasnippet :pin "e214eec8b2875d8a7cd09006dfb6a8e15e9e4079")
+(package! helm :pin "96aad023cb12e995e92763195086ccee3aa5a141")
+(package! helm-company :pin "4622b82353220ee6cc33468f710fa5b6b253b7f1")
+(package! helm-c-yasnippet :pin "c5880e740da101fde7a995e94a7b16c330e57583")
 (package! helm-descbinds :pin "b72515982396b6e336ad7beb6767e95a80fca192")
 (package! helm-describe-modes :pin "11fb36af119b784539d31c6160002de1957408aa")
-(package! helm-projectile :pin "35a2111d00c0c0c9d8743280d3f1243bb217118a")
+(package! helm-projectile :pin "e2e38825c975269a4971df25e79b2ae98929624e")
 (package! helm-rg :pin "ee0a3c09da0c843715344919400ab0a0190cc9dc")
 (package! swiper-helm :pin "93fb6db87bc6a5967898b5fd3286954cc72a0008")
 
 (when (modulep! +childframe)
-  (package! helm-posframe :pin "87461b52b6f3f378c63642a33f584d4a4ba28351"))
+  (package! helm-posframe :pin "0b6bb016f0ff4980860a9d00574de311748c40b0"))
 (when (modulep! +fuzzy)
   (package! helm-flx :pin "5220099e695a3586dba2d59640217fe378e66310"))
 (when (modulep! +icons)
-  (package! helm-icons :pin "53349000b114b2dfc874252de6605e3bafa435e2"))
+  (package! helm-icons :pin "0d113719ee72cb7b6bb7db29f7200d667bd86607"))
 (when (modulep! :lang org)
-  (package! helm-org :pin "d67186d3a64e610c03a5f3d583488f018fb032e4"))
+  (package! helm-org :pin "c80e53315ce6b096e2d0e630702df924bf00bf6a"))
diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el
index f2b89e47a..e170dc7a4 100644
--- a/modules/completion/ivy/packages.el
+++ b/modules/completion/ivy/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/ivy/packages.el
 
-(package! swiper :pin "9d630d800e856a2c984c5a62a6f0ad313a9d2228")
+(package! swiper :pin "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d")
 (package! ivy)
 (package! ivy-hydra)
 (package! ivy-avy)
@@ -13,7 +13,7 @@
 (package! wgrep :pin "3132abd3750b8c87cbcf6942db952acfab5edccd")
 
 (if (modulep! +prescient)
-    (package! ivy-prescient :pin "d7cc55dad453c465af9ececbab94426202b5b32b")
+    (package! ivy-prescient :pin "707c25c947a9f17a1d43f97b3b28aba91ec9addb")
   (when (modulep! +fuzzy)
     (package! flx :pin "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2")))
 

From 29b19412f6dcc36cf64a55c339f9a723fc0de3bc Mon Sep 17 00:00:00 2001
From: Liam Hupfer <liam@hpfr.net>
Date: Sun, 24 Sep 2023 10:09:27 -0500
Subject: [PATCH 7/7] dev: ignore .DS_Store at top level

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 124310e16..907145aa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# generated by macOS
+.DS_Store
+
 # machine generated doom profiles or metadata
 /profiles/*.el
 /.local*/