Fix doomemacs#2373: bring back package pinning

This needs some serious refactoring...

core/core-cli.el

@@ -355,16 +355,11 @@ stale."
          (doom-cli-reload-env-file 'force))
 
        (doom-cli-reload-core-autoloads)
-       (unwind-protect
-           (progn
-             (and (doom-cli-packages-install)
-                  (setq success t))
-             (and (doom-cli-packages-build)
-                  (setq success t))
-             (and (doom-cli-packages-purge prune-p 'builds-p prune-p prune-p)
-                  (setq success t)))
-         (doom-cli-reload-package-autoloads)
-         (doom-cli-byte-compile nil 'recompile))
+       (doom-cli-packages-install)
+       (doom-cli-packages-build)
+       (doom-cli-packages-purge prune-p 'builds-p prune-p prune-p)
+       (doom-cli-reload-package-autoloads)
+       (doom-cli-byte-compile nil 'recompile)
        t)))
 
   (load! "cli/env")

core/core-packages.el

@@ -124,6 +124,11 @@ missing) and shouldn't be deleted.")
       ;; We handle it ourselves
       straight-fix-org nil)
 
+(defadvice! doom--read-pinned-packages-a (orig-fn &rest args)
+  "Read from `doom-pinned-packages' on top of straight's lockfiles."
+  :around #'straight--lockfile-read-all
+  (append (apply orig-fn args) doom-pinned-packages))
+
 
 
 ;;

core/packages.el

@@ -2,43 +2,43 @@
 ;;; core/packages.el
 
 ;; core.el
-(package! auto-minor-mode :pin "17cfa1b54800fdef2975c0c0531dad34846a5065")
-(package! gcmh :pin "f542908b9ae4405d70fa70f42bd62618c5de4b95")
+(package! auto-minor-mode :pin "17cfa1b548")
+(package! gcmh :pin "f542908b9a")
 
 ;; core-ui.el
-(package! all-the-icons :pin "1416f37984486a44c6c0cbe0a2c985e82f965b6b")
-(package! hide-mode-line :pin "88888825b5b27b300683e662fa3be88d954b1cea")
-(package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307")
-(package! rainbow-delimiters :pin "5125f4e47604ad36c3eb4706310fcafac729ca8c")
-(package! restart-emacs :pin "9aa90d3df9e08bc420e1c9845ee3ff568e911bd9")
+(package! all-the-icons :pin "1416f37984")
+(package! hide-mode-line :pin "88888825b5")
+(package! highlight-numbers :pin "8b4744c7f4")
+(package! rainbow-delimiters :pin "5125f4e476")
+(package! restart-emacs :pin "9aa90d3df9")
 
 ;; core-editor.el
-(package! better-jumper :pin "6d240032ca213ccb3347e25f26c29b6822bf03a7")
-(package! dtrt-indent :pin "48221c928b72746d18c1e284c45748a0c2f1691f")
-(package! helpful :pin "e511e8dbd32a8b8423f07178f0ea7c1ecfc63935")
+(package! better-jumper :pin "6d240032ca")
+(package! dtrt-indent :pin "48221c928b")
+(package! helpful :pin "e511e8dbd3")
 (when IS-MAC
-  (package! ns-auto-titlebar :pin "1efc30d38509647b417f05587fd7003457719256"))
-(package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d")
-(package! smartparens :pin "9449ae08593180ba99e4517897e8e825d3c422a8")
+  (package! ns-auto-titlebar :pin "1efc30d385"))
+(package! pcre2el :pin "0b5b2a2c17")
+(package! smartparens :pin "9449ae0859")
 (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")
-(package! undo-tree :pin "1d91157366d1dcae889057d58526a5bd36e3febe")
+  :pin "ed666b0716")
+(package! undo-tree :pin "1d91157366")
 (package! ws-butler
   ;; Use my fork of ws-butler, which has a few choice improvements and
   ;; optimizations (the original has been abandoned).
   :recipe (:host github :repo "hlissner/ws-butler")
-  :pin "e4430d3778a1a11cc4d4770ce8d070ba71d38f07")
+  :pin "e4430d3778")
 (unless IS-WINDOWS
-  (package! xclip :pin "88003b782e0a60eab1c8a2fd8b7f140fb2328271"))
+  (package! xclip :pin "88003b782e"))
 
 ;; core-projects.el
-(package! projectile :pin "1e7b37f0ae07a6b4ac1b1a5f0e5422cfcb8e1c55")
+(package! projectile :pin "27a0da9cdc")
 
 ;; core-keybinds.el
-(package! general :pin "f6e928622d78d927c7043da904782ed7160ea803")
-(package! which-key :pin "1e3640e48c31f8062f018b5fc84acad696a0ea2a")
+(package! general :pin "f6e928622d")
+(package! which-key :pin "db3d003e90")

docs/api.org

@@ -405,7 +405,7 @@ These are side-by-side comparisons, showing how to bind keys with and without
 (package! ansible :recipe (:nonrecursive t))
 
 ;; To pin a package to a specific commit:
-(package! evil :pin "e7bc39de2f961505e8e112da8c1b315ae8afce52")
+(package! evil :pin "e7bc39de2f9")
 ;; ...or branch:
 (package! evil :recipe (:branch "stable"))
 ;; To unpin a pinned package:

modules/app/calendar/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/calendar/packages.el
 
-(package! calfw :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
-(package! calfw-org :pin "03abce97620a4a7f7ec5f911e669da9031ab9088")
-(package! org-gcal :pin "6821e349673e9ba8d7ae7b84789f931889273dc0")
+(package! calfw :pin "03abce9762")
+(package! calfw-org :pin "03abce9762")
+(package! org-gcal :pin "6821e34967")

modules/app/irc/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/irc/packages.el
 
-(package! circe :pin "0c79138fb2d37940654649787cb17cb619268748")
-(package! circe-notifications :pin "291149ac12877bbd062da993479d3533a26862b0")
+(package! circe :pin "0c79138fb2")
+(package! circe-notifications :pin "291149ac12")

modules/app/rss/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/rss/packages.el
 
-(package! elfeed :pin "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd")
-(package! elfeed-org :pin "77b6bbf222487809813de260447d31c4c59902c9")
+(package! elfeed :pin "3f0edb1737")
+(package! elfeed-org :pin "77b6bbf222")

modules/app/twitter/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; app/twitter/packages.el
 
-(package! twittering-mode :pin "114891e8fdb4f06b1326a6cf795e49c205cf9e29")
-(package! avy :pin "cf95ba9582121a1c2249e3c5efdc51acd566d190")
+(package! twittering-mode :pin "114891e8fd")
+(package! avy :pin "cf95ba9582")

modules/checkers/grammar/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; checkers/grammar/packages.el
 
-(package! langtool :pin "37e1e007e80fc01b040b7da21be5a628fbddfb1a")
-(package! writegood-mode :pin "b71757ec337e226909fb0422f0224e31acc71733")
+(package! langtool :pin "a71ed02ce0")
+(package! writegood-mode :pin "b71757ec33")

modules/checkers/spell/packages.el

@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; checkers/spell/packages.el
 
-(package! flyspell-correct :pin "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6")
+(package! flyspell-correct :pin "b0353a41a7")
 (cond ((featurep! :completion ivy)
-       (package! flyspell-correct-ivy))
+       (package! flyspell-correct-ivy :pin "b0353a41a7"))
       ((featurep! :completion helm)
-       (package! flyspell-correct-helm))
-      ((package! flyspell-correct-popup)))
+       (package! flyspell-correct-helm :pin "b0353a41a7"))
+      ((package! flyspell-correct-popup :pin "b0353a41a7")))

modules/checkers/syntax/packages.el

@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; checkers/syntax/packages.el
 
-(package! flycheck :pin "269237f6529a4ad7db5bbbc5a40c1f038accf3cd")
-(package! flycheck-popup-tip :pin "ef86aad907f27ca076859d8d9416f4f7727619c6")
+(package! flycheck :pin "269237f652")
+(package! flycheck-popup-tip :pin "ef86aad907")
 (when (featurep! +childframe)
-  (package! flycheck-posframe :pin "2b3e94c2e427ec9831c513007460c5ea9e2225a3"))
+  (package! flycheck-posframe :pin "2b3e94c2e4"))
 
 ;; TODO flymake?

modules/completion/company/packages.el

@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/company/packages.el
 
-(package! company :pin "d5053561cb166e03051c60e5c1e05a8a926dfee5")
-(package! company-dict :pin "cd7b8394f6014c57897f65d335d6b2bd65dab1f4")
-(package! company-prescient :pin "7fd8c3b8028da4733434940c4aac1209281bef58")
+(package! company :pin "d5053561cb")
+(package! company-dict :pin "cd7b8394f6")
+(package! company-prescient :pin "7fd8c3b802")
 (when (featurep! +childframe)
-  (package! company-box :pin "8fc6168f2d3a0275156dd3fdf46ba496adbab226"))
+  (package! company-box :pin "8fc6168f2d"))

modules/completion/helm/packages.el

@@ -1,18 +1,18 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/helm/packages.el
 
-(package! helm :pin "05d70ff116a696f5c18e5ad569573d8936ff01da")
-(package! helm-rg :pin "785a80fe5cc87e27c5ea3d00a70049028d9e2847")
-(package! helm-c-yasnippet :pin "65ca732b510bfc31636708aebcfe4d2d845b59b0")
-(package! helm-company :pin "6eb5c2d730a60e394e005b47c1db018697094dde")
+(package! helm :pin "c17f1c76e4")
+(package! helm-rg :pin "785a80fe5c")
+(package! helm-c-yasnippet :pin "65ca732b51")
+(package! helm-company :pin "6eb5c2d730")
 (package! helm-describe-modes
   :recipe (:host github :repo "emacs-helm/helm-describe-modes")
-  :pin "11fb36af119b784539d31c6160002de1957408aa")
-(package! helm-projectile :pin "5328b74dddcee8d1913803ca8167868831a07463")
-(package! swiper-helm :pin "93fb6db87bc6a5967898b5fd3286954cc72a0008")
+  :pin "11fb36af11")
+(package! helm-projectile :pin "5328b74ddd")
+(package! swiper-helm :pin "93fb6db87b")
 (when (featurep! +fuzzy)
-  (package! helm-flx :pin "6640fac5cb16bee73c95b8ed1248a4e5e113690e"))
+  (package! helm-flx :pin "6640fac5cb"))
 (when (featurep! +childframe)
-  (package! posframe :pin "c25077158980d8322f67fc59d999c2f6e8a020b2"))
+  (package! posframe :pin "c250771589"))
 (when (featurep! :lang org)
-  (package! helm-org :pin "8457e1e46227bf87726e05c42cec5a4b51c2ef7b"))
+  (package! helm-org :pin "8457e1e462"))

modules/completion/ido/packages.el

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/ido/packages.el
 
-(package! flx-ido :pin "17f5c9cb2af18aa6f52910ff4a5a63591261ced5")
-(package! ido-completing-read+ :pin "74861eabd0a2619be9efc4c91fe0c5e69db5f263")
-(package! ido-vertical-mode :pin "16c4c1a112796ee0bcf401ea39d3e2643a89feaf")
-(package! crm-custom :pin "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d")
+(package! flx-ido :pin "17f5c9cb2a")
+(package! ido-completing-read+ :pin "74861eabd0")
+(package! ido-vertical-mode :pin "16c4c1a112")
+(package! crm-custom :pin "f1aaccf643")

modules/completion/ivy/packages.el

@@ -1,23 +1,23 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; completion/ivy/packages.el
 
-(package! swiper :pin "e22c8dfd28ab1874b71b68628666c22e1112495f")
+(package! swiper :pin "098f8fe5ba")
 (package! ivy)
 (package! ivy-hydra)
 (package! counsel)
 
-(package! amx :pin "3af93ca066aa42dd1342f1ee0ab0d02360075613")
-(package! counsel-projectile :pin "cadc6de7070458781a373b052adddf102bbed302")
-(package! ivy-rich :pin "7bfc7262fda46c38636eac3080980024b5881a64")
-(package! wgrep :pin "379afd89ebd76f63842c8589127d66096a8bb595")
+(package! amx :pin "3af93ca066")
+(package! counsel-projectile :pin "cadc6de707")
+(package! ivy-rich :pin "7bfc7262fd")
+(package! wgrep :pin "379afd89eb")
 
 (if (featurep! +prescient)
-    (package! ivy-prescient :pin "7fd8c3b8028da4733434940c4aac1209281bef58")
+    (package! ivy-prescient :pin "7fd8c3b802")
   (when (featurep! +fuzzy)
-    (package! flx :pin "17f5c9cb2af18aa6f52910ff4a5a63591261ced5")))
+    (package! flx :pin "17f5c9cb2a")))
 
 (when (featurep! +childframe)
-  (package! ivy-posframe :pin "6d697ff00ac406b919eba8665b1bc18a2b423cda"))
+  (package! ivy-posframe :pin "6d697ff00a"))
 
 (when (featurep! +icons)
-  (package! all-the-icons-ivy :pin "babea626db20773de4c408acb2788e2b9c8277e3"))
+  (package! all-the-icons-ivy :pin "babea626db"))

modules/config/default/packages.el

@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; config/default/packages.el
 
-(package! avy :pin "cf95ba9582121a1c2249e3c5efdc51acd566d190")
-(package! drag-stuff :pin "6d06d846cd37c052d79acd0f372c13006aa7e7c8")
-(package! link-hint :pin "8d8f9505f87dc8a3b3baee7cb516f091072893a7")
+(package! avy :pin "cf95ba9582")
+(package! drag-stuff :pin "6d06d846cd")
+(package! link-hint :pin "8d8f9505f8")
 
 (unless (featurep! :editor evil)
-  (package! expand-region :pin "0fa7c2d349e40c0e1de0965acf0f0b77b7070451"))
+  (package! expand-region :pin "0fa7c2d349"))

modules/editor/evil/packages.el

@@ -1,33 +1,33 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/evil/packages.el
 
-(package! evil :pin "d14e9e2cac539f388a1f4699eb3ffab0834aa3e4")
-(package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387")
-(package! evil-easymotion :pin "79c13ed3bce018ac09d358e642e5bd7025e93603")
-(package! evil-embrace :pin "4379adea032b25e359d01a36301b4a5afdd0d1b7")
-(package! evil-escape :pin "f4e9116bfbaac8c9d210c17ad488e0982291245f")
-(package! evil-exchange :pin "35dd0f0662789f043bd89a9f9801ffaf4318123f")
-(package! evil-indent-plus :pin "0c7501e6efed661242c3a20e0a6c79a6455c2c40")
-(package! evil-nerd-commenter :pin "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304")
+(package! evil :pin "e00626d9fd")
+(package! evil-args :pin "758ad5ae54")
+(package! evil-easymotion :pin "79c13ed3bc")
+(package! evil-embrace :pin "4379adea03")
+(package! evil-escape :pin "f4e9116bfb")
+(package! evil-exchange :pin "3030e21ee1")
+(package! evil-indent-plus :pin "0c7501e6ef")
+(package! evil-nerd-commenter :pin "bed56ecb88")
 (package! evil-numbers
   :recipe (:host github :repo "janpath/evil-numbers")
-  :pin "d988041c1fe6e941dc8d591390750b237f71f524")
-(package! evil-snipe :pin "3ec8adfd4990f95fa0fab2b7019ead3596857673")
-(package! evil-surround :pin "9b0b17f06cef9bac81ee4800d121265e54718a17")
-(package! evil-textobj-anyblock :pin "ff00980f0634f95bf2ad9956b615a155ea8743be")
-(package! evil-traces :pin "257c66bd7a9162caef3b04137af0dc9360fe3d53")
-(package! evil-visualstar :pin "06c053d8f7381f91c53311b1234872ca96ced752")
-(package! exato :pin "88266fa7fcfbef704032f671b94f756f2f98bd4f")
+  :pin "d988041c1f")
+(package! evil-snipe :pin "3ec8adfd49")
+(package! evil-surround :pin "9b0b17f06c")
+(package! evil-textobj-anyblock :pin "ff00980f06")
+(package! evil-traces :pin "257c66bd7a")
+(package! evil-visualstar :pin "06c053d8f7")
+(package! exato :pin "88266fa7fc")
 (package! evil-quick-diff
   :recipe (:host github :repo "rgrinberg/evil-quick-diff")
-  :pin "69c883720b30a892c63bc89f49d4f0e8b8028908")
+  :pin "69c883720b")
 
 ;;
 (when (featurep! +everywhere)
   ;; `evil-collection-neotree' uses the `neotree-make-executor' macro, but this
   ;; requires neotree be available during byte-compilation (while installing).
   (when (featurep! :ui neotree)
-    (package! neotree)
+    (package! neotree :pin "c2420a4b34")
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "8532282e6492ce92d8c54e43ce9e9ce616d8ab5f"))
+  (package! evil-collection :pin "e9a592e5ee"))

modules/editor/file-templates/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/file-templates/packages.el
 
-(package! yasnippet :pin "3bf9a3b1af37174a004798b7195826af0123fa6a")
+(package! yasnippet :pin "3bf9a3b1af")

modules/editor/fold/packages.el

@@ -2,4 +2,4 @@
 ;;; editor/fold/packages.el
 
 (when (featurep! :editor evil)
-  (package! evil-vimish-fold :pin "c617fecb91303f8c63f85a6101a503fdc88aae84"))
+  (package! evil-vimish-fold :pin "b6e0e6b91b"))

modules/editor/format/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/format/packages.el
 
-(package! format-all :pin "d126830a739a565f858ae3e31887881bc07e8fe6")
+(package! format-all :pin "d126830a73")

modules/editor/god/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/god/packages.el
 
-(package! god-mode :pin "344167ed9b4c212273dd056e7481cf1373b461d0")
+(package! god-mode :pin "344167ed9b")

modules/editor/lispy/packages.el

@@ -1,7 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/lispyville/packages.el
 
-(package! lispy :pin "8db042d40bccc628dd406c1fe712431fb76b3288")
-
+(package! lispy :pin "d6b19fe2c3")
 (when (featurep! :editor evil)
-  (package! lispyville :pin "56198f1c4488a52a0d0512c717dff36e8b9fbfd0"))
+  (package! lispyville :pin "56198f1c44"))

modules/editor/multiple-cursors/packages.el

@@ -3,7 +3,7 @@
 
 (cond
  ((featurep! :editor evil)
-  (package! evil-multiedit :pin "c3d43b1a65c193755dae2c41ce5c072c4c01b35d")
-  (package! evil-mc :pin "007d471e26b44e692250804f82f06ebbd27b6ec4"))
+  (package! evil-multiedit :pin "c3d43b1a65")
+  (package! evil-mc :pin "007d471e26"))
 
- ((package! multiple-cursors :pin "b880554d04b8f61165afba7d4de19ac9e39bb7ab")))
+ ((package! multiple-cursors :pin "b880554d04")))

modules/editor/objed/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/objed/packages.el
 
-(package! objed :pin "8dc17701d1dc65b5d2113e7ca406136bf612bc9e")
+(package! objed :pin "8dc17701d1")

modules/editor/parinfer/packages.el

@@ -11,4 +11,4 @@
   ;; separate session:
   (autoload 'evil-define-key "evil-core" nil nil 'macro))
 
-(package! parinfer :pin "eaad857ae4351f72a561ee3dec8943713510003f")
+(package! parinfer :pin "eaad857ae4")

modules/editor/rotate-text/packages.el

@@ -3,4 +3,4 @@
 
 (package! rotate-text
   :recipe (:host github :repo "debug-ito/rotate-text.el")
-  :pin "48f193697db996855aee1ad2bc99b38c6646fe76")
+  :pin "48f193697d")